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:22:01 UTC

[36/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/87d6e438
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/87d6e438
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/87d6e438

Branch: refs/heads/es-type-updates
Commit: 87d6e4387b8782b990f0d8fa5adbbe98027a1e95
Parents: 11eef84 4436ead
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Nov 10 09:21:43 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Nov 10 09:21:43 2014 -0500

----------------------------------------------------------------------
 stack/loadtests/README.md                                      | 4 ++--
 .../org/apache/usergrid/scenarios/NotificationScenarios.scala  | 6 +++---
 .../src/main/scala/org/apache/usergrid/settings/Settings.scala | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------