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/12 20:12:07 UTC
[26/27] incubator-usergrid git commit: Merge remote-tracking branch
'origin/two-dot-o' into es-type-updates-ryan-external
Merge remote-tracking branch 'origin/two-dot-o' into es-type-updates-ryan-external
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/28eb2cd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/28eb2cd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/28eb2cd9
Branch: refs/heads/two-dot-o
Commit: 28eb2cd9fe6b1fbccc0ddd1fd9693bddd42edd5c
Parents: e7b7758 84b8365
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Nov 12 12:11:07 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Nov 12 12:11:07 2014 -0700
----------------------------------------------------------------------
.../datagenerators/FeederGenerator.scala | 17 +++------
.../usergrid/scenarios/DeviceScenarios.scala | 34 +++++++++--------
.../usergrid/scenarios/UserScenarios.scala | 40 +++++++++++---------
.../org/apache/usergrid/settings/Settings.scala | 5 ++-
.../simulations/ConnectionsSimulation.scala | 2 +-
.../simulations/GetEntitySimulation.scala | 2 +-
.../PushNotificationTargetUserSimulation.scala | 2 +-
7 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------