« Previous | Next » 

Revision f2e3cc2b

IDf2e3cc2beadcdfa86fb63e6b0429d958ec2adb8f

Added by Christos KK Loverdos over 11 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted