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/two-dot-o Commit: 11eef841244681d308ac49ca64e2084597026f88 Parents: 5ade7bb 7c14d83 Author: Dave Johnson <[email protected]> Authored: Fri Nov 7 17:57:43 2014 -0500 Committer: Dave Johnson <[email protected]> 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(-) ----------------------------------------------------------------------
