You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/11/02 18:17:24 UTC
[17/17] usergrid git commit: Merge commit 'refs/pull/421/head' of
github.com:apache/usergrid
Merge commit 'refs/pull/421/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/568d35d5
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/568d35d5
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/568d35d5
Branch: refs/heads/master
Commit: 568d35d57e8a664a9eaf4ce9edf313d49e7e963b
Parents: b031d4d 73dcaeb
Author: Michael Russo <mi...@gmail.com>
Authored: Mon Nov 2 09:16:45 2015 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Mon Nov 2 09:16:45 2015 -0800
----------------------------------------------------------------------
stack/loadtests/README.md | 14 +-
stack/loadtests/runAuditDeleteEntities.sh | 65 ++++++
.../runAuditGetAllAppCollectionEntities.sh | 6 +-
.../loadtests/runAuditGetCollectionEntities.sh | 6 +-
.../runAuditVerifyCollectionEntities.sh | 2 +-
stack/loadtests/runLoadEntitiesUnlimited.sh | 1 +
stack/loadtests/runOrgAppSetup.sh | 17 +-
.../datagenerators/FeederGenerator.scala | 16 +-
.../usergrid/enums/ConfigProperties.scala | 8 +-
.../apache/usergrid/enums/ScenarioType.scala | 3 +-
.../apache/usergrid/helpers/Extractors.scala | 18 +-
.../usergrid/scenarios/AuditScenarios.scala | 203 +++++++++++++------
.../scenarios/EntityCollectionScenarios.scala | 102 +++++++---
.../org/apache/usergrid/settings/Settings.scala | 42 ++--
.../usergrid/simulations/AuditSimulation.scala | 15 +-
.../simulations/ConfigurableSimulation.scala | 2 +-
stack/loadtests/testConfig.sh | 4 +-
17 files changed, 385 insertions(+), 139 deletions(-)
----------------------------------------------------------------------