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/03/26 22:20:54 UTC
[10/35] git commit: Merge remote-tracking branch 'origin/two-dot-o'
into hystrix-integration
Merge remote-tracking branch 'origin/two-dot-o' into hystrix-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/58f7f436
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/58f7f436
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/58f7f436
Branch: refs/heads/two-dot-o
Commit: 58f7f43642826c06f7aace698c6088a35186a6a0
Parents: 457528f 9d6ed41
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Mar 21 10:15:31 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Mar 21 10:15:31 2014 -0700
----------------------------------------------------------------------
.gitignore | 6 +
stack/awscluster/README.md | 31 +-
stack/corepersistence/perftest1/pom.xml | 76 +++++
.../usergrid/persistence/UsergridBootstrap.java | 303 ++++++++++++++++++
.../src/main/resources/log4j.properties | 44 +++
.../src/main/resources/project.properties | 1 +
.../main/resources/usergrid-test-context.xml | 39 +++
.../persistence/Usergrid1PerformanceTest.java | 302 ++++++++++++++++++
.../persistence/UsergridBootstrapTest.java | 56 ++++
stack/corepersistence/perftest2/pom.xml | 64 ++++
.../main/groovy/perftest2/CreateEntity.groovy | 100 ++++++
.../persistence/CorePerformanceTest.java | 318 +++++++++++++++++++
.../index/guice/TestIndexModule.java | 30 ++
.../index/impl/EsEntityCollectionIndex.java | 13 +-
.../index/impl/CorePerformanceIT.java | 304 ++++++++++++++++++
stack/pom.xml | 3 +
16 files changed, 1666 insertions(+), 24 deletions(-)
----------------------------------------------------------------------