Merge e3f8bba53c9c70b4ae871ce1ee11837327195b6d into 53e2ade8e9572ccce35126923330136de22c187c
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2709c964 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2709c964 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2709c964 Branch: refs/pull/18/merge Commit: 2709c964ee03882f98c7d73a570886709633941d Parents: 53e2ade e3f8bba Author: tonuquq <[email protected]> Authored: Tue Jan 21 11:42:45 2014 -0800 Committer: tonuquq <[email protected]> Committed: Tue Jan 21 11:42:45 2014 -0800 ---------------------------------------------------------------------- stack/.gitignore | 1 + stack/corepersistence/collection/pom.xml | 61 +++++- .../astyanax/AstyanaxKeyspaceProvider.java | 28 ++- .../collection/astyanax/CassandraFig.java | 2 +- .../cassandra/AvailablePortFinder.java | 187 +++++++++++++++++++ .../collection/guice/CollectionModule.java | 37 ++++ .../src/main/resources/usergrid.properties | 1 + .../cassandra/AvailablePortFinder.java | 187 ------------------- .../collection/cassandra/CassandraRule.java | 27 +-- ...MvccEntitySerializationStrategyImplTest.java | 22 ++- .../src/test/resources/log4j.properties | 12 +- .../src/test/resources/usergrid-CHOP.properties | 12 ++ .../src/test/resources/usergrid-UNIT.properties | 1 + .../persistence/model/field/EntityTest.java | 4 +- 14 files changed, 357 insertions(+), 225 deletions(-) ----------------------------------------------------------------------
