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/16 18:30:38 UTC
[42/51] [abbrv] git commit: Merge
265d7dfed88d8906dd2926b2119d6713cee6ced8 into
2697a211cb9abf2e92718c9f01763dcd28b39f7d
Merge 265d7dfed88d8906dd2926b2119d6713cee6ced8 into 2697a211cb9abf2e92718c9f01763dcd28b39f7d
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5e631c3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5e631c3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5e631c3c
Branch: refs/pull/18/merge
Commit: 5e631c3cd5d084b05828871f6bf4c6d567f09b55
Parents: 2697a21 265d7df
Author: tonuquq <to...@gmail.com>
Authored: Wed Jan 15 21:18:51 2014 -0800
Committer: tonuquq <to...@gmail.com>
Committed: Wed Jan 15 21:18:51 2014 -0800
----------------------------------------------------------------------
stack/.gitignore | 1 +
stack/corepersistence/collection.tgz | Bin 0 -> 47520 bytes
stack/corepersistence/collection/pom.xml | 47 ++++-
.../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/usergrid-CHOP.properties | 12 ++
.../src/test/resources/usergrid-UNIT.properties | 1 +
13 files changed, 334 insertions(+), 218 deletions(-)
----------------------------------------------------------------------