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/27 18:20:53 UTC
[06/27] git commit: Merge branch 'two-dot-o' into hystrix-integration
Merge branch '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/b1d12a17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b1d12a17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b1d12a17
Branch: refs/heads/entity-manager
Commit: b1d12a17176dbcaa518cc41430322bad11550557
Parents: 58f7f43 fc10597
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Mar 24 08:16:49 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Mar 24 08:16:49 2014 -0700
----------------------------------------------------------------------
stack/awscluster/README.md | 2 +-
.../src/main/groovy/wait_for_instances.groovy | 2 +-
stack/corepersistence/perftest1/pom.xml | 9 ++---
.../persistence/Usergrid1PerformanceTest.java | 36 +++++++++++---------
4 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------