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/10/14 23:00:36 UTC

[12/23] git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update

Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e64e9c92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e64e9c92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e64e9c92

Branch: refs/heads/cloudformation-update
Commit: e64e9c928da76d91cb320c3f820962f9cbd85f2f
Parents: 112661a 693cb2d
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 12:35:52 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 12:35:52 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/usergrid/services/ServiceManager.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------