Merge branch 'snapshots'
authorChristos KK Loverdos <loverdos@gmail.com>
Fri, 5 Oct 2012 08:37:58 +0000 (11:37 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Fri, 5 Oct 2012 08:37:58 +0000 (11:37 +0300)
commitf2e3cc2beadcdfa86fb63e6b0429d958ec2adb8f
tree951f360f1916099aeb12f1550d22c01f2c007f2c
parent53389ed0b8caea848ba2f8b5d146d91faea987c9
parent060b04bd9458fd5ec3c68c80671595e24a09858a
Merge branch 'snapshots'

Conflicts:
src/main/java/gr/grnet/aquarium/message/avro/gen/BillEntryMsg.java
src/main/java/gr/grnet/aquarium/message/avro/gen/ChargeEntryMsg.java
src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
src/main/java/gr/grnet/aquarium/message/avro/gen/BillEntryMsg.java
src/main/java/gr/grnet/aquarium/message/avro/gen/ChargeEntryMsg.java
src/main/java/gr/grnet/aquarium/message/avro/gen/EventEntryMsg.java
src/main/java/gr/grnet/aquarium/message/avro/gen/ResourceEntryMsg.java
src/main/java/gr/grnet/aquarium/message/avro/gen/ServiceEntryMsg.java
src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala
src/main/scala/gr/grnet/aquarium/message/avro/MessageHelpers.scala
src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala