Merge commit 'refs/pull/403/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/1393c2f7 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1393c2f7 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1393c2f7 Branch: refs/heads/master Commit: 1393c2f76e44150352497f661907801151807806 Parents: 59edea1 2f307a7 Author: Michael Russo <michaelaru...@gmail.com> Authored: Tue Oct 20 12:18:48 2015 -0700 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Tue Oct 20 12:18:48 2015 -0700 ---------------------------------------------------------------------- .../runAuditVerifyCollectionEntities.sh | 11 +- stack/loadtests/runDeleteEntities.sh | 13 +- stack/loadtests/runLoadEntitiesUnlimited.sh | 103 +++++++++++++ .../datagenerators/FeederGenerator.scala | 9 +- .../usergrid/enums/ConfigProperties.scala | 15 +- .../apache/usergrid/helpers/Extractors.scala | 24 ++- .../org/apache/usergrid/helpers/Headers.scala | 7 + .../usergrid/scenarios/AuditScenarios.scala | 121 ++++++++++++++- .../scenarios/EntityCollectionScenarios.scala | 38 ++++- .../org/apache/usergrid/settings/Settings.scala | 150 +++++++++++++++---- stack/loadtests/testConfig.sh | 3 + 11 files changed, 435 insertions(+), 59 deletions(-) ----------------------------------------------------------------------