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/30 02:21:30 UTC

[50/50] [abbrv] git commit: Merge pull request #18 from tonuquq/two-dot-o

Merge pull request #18 from tonuquq/two-dot-o

adding chop integration for distributed performance stress tests

Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2c6e7e48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2c6e7e48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2c6e7e48

Branch: refs/heads/USERGRID-2771-graph-edges
Commit: 2c6e7e4863d57c9f69d32829ee3acaaee3635647
Parents: 53e2ade e3f8bba
Author: Dave Johnson <da...@rollerweblogger.org>
Authored: Tue Jan 21 12:36:17 2014 -0800
Committer: Dave Johnson <da...@rollerweblogger.org>
Committed: Tue Jan 21 12:36:17 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(-)
----------------------------------------------------------------------