You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/11/10 15:24:32 UTC
[50/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' into two-dot-o-events
Merge branch 'two-dot-o' into two-dot-o-events
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1f71cf6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1f71cf6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1f71cf6c
Branch: refs/heads/two-dot-o-events
Commit: 1f71cf6c7337905608b3994a36870191cf98446e
Parents: 8457acf 87d6e43
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Nov 10 09:22:41 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Nov 10 09:22:41 2014 -0500
----------------------------------------------------------------------
.../index/impl/ElasticSearchResource.java | 30 +++-
stack/loadtests/README.md | 4 +-
.../org/apache/usergrid/helpers/Setup.scala | 46 ++++---
.../scenarios/ConnectionScenarios.scala | 10 +-
.../scenarios/NotificationScenarios.scala | 6 +-
.../org/apache/usergrid/settings/Settings.scala | 23 ++--
.../usergrid/simulations/AppSimulation.scala | 16 +--
.../usergrid/cassandra/CassandraResource.java | 138 +++++++++++++++----
8 files changed, 192 insertions(+), 81 deletions(-)
----------------------------------------------------------------------