Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/efa96dc4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/efa96dc4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/efa96dc4 Branch: refs/heads/remove-inmemory-event-service Commit: efa96dc47bb5c0248205565e24f7afba9102d2af Parents: c71133f 1393c2f Author: Shawn Feldman <sfeld...@apache.org> Authored: Tue Oct 20 15:59:34 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Tue Oct 20 15:59:34 2015 -0600 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------