usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [2/2] incubator-usergrid git commit: merge
Date Thu, 13 Aug 2015 20:58:29 GMT
merge


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

Branch: refs/heads/two-dot-o-dev
Commit: 35430a59dc05dda448c94695f99107d96aa8cdae
Parents: 5803d58 4f9650b
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Thu Aug 13 14:57:45 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Thu Aug 13 14:57:45 2015 -0600

----------------------------------------------------------------------
 .../index/impl/EsIndexBufferConsumerImpl.java   |  15 ++-
 .../persistence/index/usergrid-mappings.json    |   3 +-
 .../queue/util/AmazonNotificationUtils.java     |   4 +-
 .../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 ++++++++
 26 files changed, 1105 insertions(+), 694 deletions(-)
----------------------------------------------------------------------



Mime
View raw message