Merge branch 'master' into remove-inmemory-event-service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/af11143e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/af11143e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/af11143e Branch: refs/heads/remove-inmemory-event-service Commit: af11143ead2d1bfc539ca2515b87d548614d52d1 Parents: fad8ecd efa96dc Author: Shawn Feldman <[email protected]> Authored: Tue Oct 20 16:00:16 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Oct 20 16:00:16 2015 -0600 ---------------------------------------------------------------------- stack/Coverage.md | 21 +++ stack/core/pom.xml | 2 +- stack/corepersistence/collection/pom.xml | 50 ++----- stack/corepersistence/common/pom.xml | 16 ++ stack/corepersistence/graph/pom.xml | 94 +++++------- stack/corepersistence/map/pom.xml | 16 ++ stack/corepersistence/model/pom.xml | 16 ++ stack/corepersistence/pom.xml | 9 ++ stack/corepersistence/queryindex/pom.xml | 38 +++-- stack/corepersistence/queue/pom.xml | 16 ++ .../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 + stack/pom.xml | 91 ++++++++--- stack/rest/pom.xml | 8 +- stack/services/pom.xml | 4 +- stack/test-utils/pom.xml | 2 +- stack/tools/pom.xml | 2 +- stack/websocket/pom.xml | 2 +- 27 files changed, 684 insertions(+), 197 deletions(-) ----------------------------------------------------------------------
