Merge branch 'USERGRID-575' of https://github.com/apache/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2e90f39c Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2e90f39c Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2e90f39c Branch: refs/heads/two-dot-o Commit: 2e90f39cea164f0e1f84c7a5db88fddb6d656fa1 Parents: 61b492b 23febdf Author: GERey <gre...@apigee.com> Authored: Mon Apr 20 09:17:45 2015 -0700 Committer: GERey <gre...@apigee.com> Committed: Mon Apr 20 09:17:45 2015 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 27 +++-- .../organizations/OrganizationsResource.java | 18 +++- .../rest/management/users/UserResource.java | 42 ++++++++ .../rest/management/users/UsersResource.java | 16 ++- .../rest/management/ManagementResourceIT.java | 29 ++++-- .../rest/management/users/MUUserResourceIT.java | 101 +++++++++++++++++-- 6 files changed, 199 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
