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/07 17:44:14 UTC
[4/5] incubator-usergrid git commit: Merge remote-tracking branch
'ryan/APIBAAS-1362' into merge
Merge remote-tracking branch 'ryan/APIBAAS-1362' into 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/ef9e94ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ef9e94ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ef9e94ec
Branch: refs/heads/es-type-updates-ryan-external
Commit: ef9e94ec75a688523c190bb84d4d5bd281eed310
Parents: eef2b70 bf2bd80
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Nov 7 08:56:39 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Nov 7 08:56:39 2014 -0700
----------------------------------------------------------------------
.../index/impl/ElasticSearchResource.java | 30 +++-
stack/loadtests/README.md | 23 +++
stack/loadtests/pom.xml | 10 --
.../datagenerators/EntityDataGenerator.scala | 5 +-
.../org/apache/usergrid/helpers/Setup.scala | 168 +++++++++++++++++++
.../scenarios/NotificationScenarios.scala | 11 +-
.../usergrid/scenarios/UserScenarios.scala | 15 +-
.../org/apache/usergrid/settings/Settings.scala | 20 ++-
.../usergrid/simulations/AppSimulation.scala | 49 ++++++
.../simulations/GeoProfileSimulation.scala | 33 ++++
.../PushNotificationTargetUserSimulation.scala | 22 ++-
stack/loadtests/src/test/scala/Engine.scala | 2 +-
.../usergrid/cassandra/CassandraResource.java | 138 +++++++++++----
13 files changed, 459 insertions(+), 67 deletions(-)
----------------------------------------------------------------------