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:21:59 UTC
[34/42] 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/11eef841
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/11eef841
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/11eef841
Branch: refs/heads/es-type-updates
Commit: 11eef841244681d308ac49ca64e2084597026f88
Parents: 5ade7bb 7c14d83
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Nov 7 17:57:43 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Nov 7 17:57:43 2014 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/helpers/Setup.scala | 46 ++++++++++++--------
.../scenarios/ConnectionScenarios.scala | 10 ++++-
.../scenarios/NotificationScenarios.scala | 4 +-
.../org/apache/usergrid/settings/Settings.scala | 21 ++++-----
.../usergrid/simulations/AppSimulation.scala | 16 +++----
5 files changed, 53 insertions(+), 44 deletions(-)
----------------------------------------------------------------------