You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/11/11 00:29:14 UTC
[26/26] incubator-usergrid git commit: Merge branch 'es-type-updates'
into es-type-updates-ryan-external
Merge branch 'es-type-updates' into es-type-updates-ryan-external
Conflicts:
stack/loadtests/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e16dd43d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e16dd43d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e16dd43d
Branch: refs/heads/es-type-updates-ryan-external
Commit: e16dd43db77c44c27736b311c07b80f04ea62ff9
Parents: be6c3c2 c31e1b3
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Nov 10 16:28:41 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Nov 10 16:28:41 2014 -0700
----------------------------------------------------------------------
stack/awscluster/src/main/cql/create_locks.cql | 26 --
.../awscluster/src/main/cql/create_usergrid.cql | 28 ---
.../main/cql/create_usergrid_applications.cql | 47 ----
stack/awscluster/src/main/cql/update_locks.cql | 23 ++
.../awscluster/src/main/cql/update_usergrid.cql | 27 ++
.../main/cql/update_usergrid_applications.cql | 46 ++++
.../main/dist/init_instance/create_keyspaces.sh | 61 -----
.../main/dist/init_instance/init_db_server.sh | 4 -
.../main/dist/init_instance/init_rest_server.sh | 28 ++-
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../main/dist/init_instance/update_keyspaces.sh | 66 +++++
.../src/main/groovy/NodeRegistry.groovy | 8 +-
.../src/main/groovy/configure_usergrid.groovy | 2 +-
stack/awscluster/ugcluster-cf.json | 246 ++++++++++++++-----
stack/core/pom.xml | 1 +
.../corepersistence/CpEntityManager.java | 5 +-
.../corepersistence/CpRelationManager.java | 25 +-
.../usergrid/corepersistence/CpSetup.java | 4 +-
.../persistence/cassandra/CassandraService.java | 3 +
stack/loadtests/README.md | 16 +-
.../datagenerators/EntityDataGenerator.scala | 23 +-
.../datagenerators/FeederGenerator.scala | 52 +++-
.../org/apache/usergrid/helpers/Setup.scala | 46 ++--
.../scenarios/ConnectionScenarios.scala | 29 ++-
.../usergrid/scenarios/EntityScenarios.scala | 65 +++++
.../scenarios/NotificationScenarios.scala | 15 +-
.../usergrid/scenarios/UserScenarios.scala | 32 ++-
.../org/apache/usergrid/settings/Settings.scala | 34 +--
.../usergrid/simulations/AppSimulation.scala | 9 +-
.../simulations/ConnectionsSimulation.scala | 53 ++++
.../simulations/GeoProfileSimulation.scala | 33 ---
.../PostCustomEntitySimulation.scala | 61 +++++
.../simulations/PostDevicesSimulation.scala | 45 ----
.../usergrid/simulations/SetupSimulation.scala | 45 ++++
stack/loadtests/src/test/scala/Engine.scala | 4 +-
.../services/users/devices/DevicesService.java | 4 +-
36 files changed, 818 insertions(+), 404 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e16dd43d/stack/loadtests/README.md
----------------------------------------------------------------------