You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/08/31 22:24:19 UTC
[3/3] usergrid git commit: Merge commit 'refs/pull/369/head' of
github.com:apache/usergrid into two-dot-o-dev
Merge commit 'refs/pull/369/head' of github.com:apache/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d626f8cb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d626f8cb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d626f8cb
Branch: refs/heads/two-dot-o-dev
Commit: d626f8cb7b88c8f876d9ad74b13b85e3fb524650
Parents: c905ebe 245fb7e
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Aug 31 14:24:04 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Aug 31 14:24:04 2015 -0600
----------------------------------------------------------------------
stack/loadtests/README.md | 10 +-
stack/loadtests/runOrgAppSetup.sh | 88 ++++++++++++
stack/loadtests/runRandomEntityByNameTest.sh | 4 +-
stack/loadtests/runRandomEntityByUuidTest.sh | 6 +-
.../usergrid/enums/ConfigProperties.scala | 8 +-
.../apache/usergrid/enums/ScenarioType.scala | 3 +-
.../scenarios/EntityCollectionScenarios.scala | 6 +
.../org/apache/usergrid/settings/Settings.scala | 22 +++
.../simulations/ConfigurableSimulation.scala | 1 +
stack/loadtests/testConfig.sh | 1 +
stack/pom.xml | 1 +
.../usergrid/rest/CollectionMetadataIT.java | 142 +++++++++++++++++++
.../test/resource/endpoints/NamedResource.java | 6 +-
.../test/resource/model/QueryParameters.java | 8 ++
14 files changed, 293 insertions(+), 13 deletions(-)
----------------------------------------------------------------------