Merge branch 'master' of https://code.grnet.gr/git/aquarium
authorChristos KK Loverdos <loverdos@gmail.com>
Mon, 10 Sep 2012 13:31:50 +0000 (16:31 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Mon, 10 Sep 2012 13:31:50 +0000 (16:31 +0300)
commitb8da976b4465cf2a36bd22e4edbe1e549942c696
treed6e567b0ecb7ae4d830e9122121366b416e00dc5
parent55c8d76fb979c6710054bdfa1e672fb915ff8037
parent098aad84a476fd3da9ed68e24a5257c521a61c55
Merge branch 'master' of https://code.grnet.gr/git/aquarium

Conflicts:
src/main/scala/gr/grnet/aquarium/charging/ContinuousChargingBehavior.scala
src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala
src/test/scala/gr/grnet/aquarium/BillTest.scala
src/main/scala/gr/grnet/aquarium/Aquarium.scala
src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
src/main/scala/gr/grnet/aquarium/charging/ChargingBehavior.scala
src/main/scala/gr/grnet/aquarium/charging/ContinuousChargingBehavior.scala
src/main/scala/gr/grnet/aquarium/charging/VMChargingBehavior.scala
src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala
src/main/scala/gr/grnet/aquarium/connector/rabbitmq/RabbitMQProducer.scala
src/main/scala/gr/grnet/aquarium/message/MessageConstants.scala
src/main/scala/gr/grnet/aquarium/message/avro/MessageFactory.scala
src/main/scala/gr/grnet/aquarium/message/avro/MessageHelpers.scala
src/test/scala/gr/grnet/aquarium/BillTest.scala