You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/12/16 16:00:07 UTC

[37/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into two-dot-o-events

Merge branch 'two-dot-o' into two-dot-o-events


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

Branch: refs/heads/no-source-in-es
Commit: 21c93f1e30c23cc6f24dd50bf49271098ae680fa
Parents: 88d49cb 277eb73
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Dec 1 09:38:37 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Dec 1 09:38:37 2014 -0500

----------------------------------------------------------------------
 .../rest/management/users/UsersResource.java    | 38 ++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------