Merge branch 'hotfix-20160819'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/efb5bfbf Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/efb5bfbf Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/efb5bfbf Branch: refs/heads/asf-site Commit: efb5bfbfd25eb6e8cd4f0d25a8056e7fd874ae9d Parents: d090154 b567014 Author: Michael Russo <[email protected]> Authored: Tue Sep 6 20:38:39 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Sep 6 20:38:39 2016 -0700 ---------------------------------------------------------------------- .../usergrid/rest/management/users/UserResource.java | 2 +- .../apache/usergrid/rest/management/AdminUsersIT.java | 2 +- .../apache/usergrid/management/ManagementService.java | 2 +- .../management/cassandra/ManagementServiceImpl.java | 13 ++++++++----- 4 files changed, 11 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
