You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/12 23:35:43 UTC

[6/6] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://github.com/mdunker/incubator-usergrid into two-dot-o-dev

Merge branch 'two-dot-o-dev' of https://github.com/mdunker/incubator-usergrid into two-dot-o-dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1ff4774a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1ff4774a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1ff4774a

Branch: refs/heads/two-dot-o-dev
Commit: 1ff4774a37694ed892daf0f67aac649e7a61d700
Parents: d7310c5 93fb85a
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 12 14:23:35 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 12 14:23:35 2015 -0700

----------------------------------------------------------------------
 .../loadtests/runAuditGetCollectionEntities.sh  |  75 +++++------
 .../runAuditVerifyCollectionEntities.sh         |  68 +++++-----
 stack/loadtests/runCollectionQueryTest.sh       | 112 +++++++---------
 .../runCustomInjectRandomEntityByUuidTest.sh    | 107 +++++++++++++++
 stack/loadtests/runDeleteEntities.sh            | 115 +++++++---------
 .../loadtests/runGetEntitiesByNameSequential.sh | 112 ++++++++--------
 stack/loadtests/runLoadEntities.sh              | 127 ++++++++----------
 stack/loadtests/runLoadNoNameEntities.sh        |  97 ++++++++++++++
 stack/loadtests/runLoadSortableEntities.sh      | 134 +++++++++----------
 stack/loadtests/runRandomEntityByNameTest.sh    | 113 +++++++---------
 stack/loadtests/runRandomEntityByUuidTest.sh    | 111 +++++++--------
 stack/loadtests/runUpdateEntities.sh            | 117 ++++++++--------
 .../datagenerators/FeederGenerator.scala        |  18 ++-
 .../usergrid/enums/ConfigProperties.scala       |  13 +-
 .../usergrid/enums/EndConditionType.scala       |   3 +-
 .../apache/usergrid/helpers/Extractors.scala    |  13 +-
 .../usergrid/scenarios/AuditScenarios.scala     |  71 +++++-----
 .../scenarios/EntityCollectionScenarios.scala   |  64 +++++----
 .../org/apache/usergrid/settings/Settings.scala | 103 +++++++++++---
 .../usergrid/simulations/AuditSimulation.scala  |   5 +-
 .../simulations/ConfigurableSimulation.scala    |  33 ++++-
 .../simulations/CustomInjectionSimulation.scala | 107 +++++++++++++++
 stack/loadtests/testConfig.sh                   |  59 ++++++++
 23 files changed, 1091 insertions(+), 686 deletions(-)
----------------------------------------------------------------------