You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/03 21:27:32 UTC
[6/8] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6210092f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6210092f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6210092f
Branch: refs/heads/index-alias
Commit: 6210092f073062bd5a147ddf2e42a00830e66c9d
Parents: 5d86227 c2bc921
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Dec 3 14:54:29 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Dec 3 14:54:29 2014 -0500
----------------------------------------------------------------------
stack/awscluster/gatling-cluster-cf.json | 387 +++++++++++++++++++
stack/awscluster/pom.xml | 2 +-
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../src/main/groovy/NodeRegistry.groovy | 197 +++++++---
.../main/groovy/configure_elasticsearch.groovy | 31 +-
.../src/main/groovy/registry_list.groovy | 36 --
stack/awscluster/ugcluster-cf.json | 7 +-
.../MvccEntitySerializationStrategyImpl.java | 2 +-
.../persistence/model/field/LocationField.java | 8 +
stack/loadtests/README.md | 19 +
stack/loadtests/pom.xml | 4 +-
.../usergrid/scenarios/DeviceScenarios.scala | 2 +-
.../usergrid/scenarios/UserScenarios.scala | 54 ++-
.../org/apache/usergrid/settings/Settings.scala | 2 +-
.../simulations/PostUsersSimulation.scala | 49 +--
.../usergrid/simulations/SetupSimulation.scala | 4 +-
stack/loadtests/src/test/scala/Engine.scala | 4 +-
stack/pom.xml | 1 +
18 files changed, 654 insertions(+), 161 deletions(-)
----------------------------------------------------------------------