You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/12/08 23:35:09 UTC

[2/3] usergrid git commit: Merge branch '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid into unique_index_logging

Merge branch '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid into unique_index_logging

# By Michael Russo
# Via Michael Russo
* '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid:
  Add endpoint that allows fixing of admin user accounts.


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

Branch: refs/heads/unique_index_logging
Commit: 15d8164e96510fa2b8cb869e459a708f027db552
Parents: aba5705 aa1ae74
Author: George Reyes <gr...@apache.org>
Authored: Tue Dec 8 14:16:36 2015 -0800
Committer: George Reyes <gr...@apache.org>
Committed: Tue Dec 8 14:16:36 2015 -0800

----------------------------------------------------------------------
 .../rest/management/users/UsersResource.java    | 73 +++++++++++++++++---
 1 file changed, 64 insertions(+), 9 deletions(-)
----------------------------------------------------------------------