You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/20 06:22:22 UTC
[51/51] [abbrv] git commit: Merge
8781eaf760bc71b869bc2af4b183c6aa64ca2ab3 into
d8459deec6ddf7013dd725b2f7f36e4b6b932aff
Merge 8781eaf760bc71b869bc2af4b183c6aa64ca2ab3 into d8459deec6ddf7013dd725b2f7f36e4b6b932aff
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4b2e1879
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4b2e1879
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4b2e1879
Branch: refs/pull/18/merge
Commit: 4b2e18791043acc0257ebf5f9b7464dee7acc08f
Parents: d8459de 8781eaf
Author: tonuquq <to...@gmail.com>
Authored: Sun Jan 19 20:42:07 2014 -0800
Committer: tonuquq <to...@gmail.com>
Committed: Sun Jan 19 20:42:07 2014 -0800
----------------------------------------------------------------------
stack/.gitignore | 1 +
stack/corepersistence/collection.tgz | Bin 0 -> 47520 bytes
stack/corepersistence/collection/pom.xml | 67 ++++++-
.../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 +-
15 files changed, 364 insertions(+), 224 deletions(-)
----------------------------------------------------------------------