Merge commit 'refs/pull/540/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/57494925 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/57494925 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/57494925 Branch: refs/heads/usergrid-1268-akka-211 Commit: 57494925989bcd6cc10f09af5d16b6af18d0e707 Parents: cf4c7f8 7f49c80 Author: Michael Russo <[email protected]> Authored: Thu Jun 23 15:25:49 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Thu Jun 23 15:25:49 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 32 +++++--- .../usergrid/rest/management/AdminUsersIT.java | 80 ++++++++++++++++++++ .../cassandra/ManagementServiceImpl.java | 33 +++++--- .../services/devices/DevicesService.java | 2 + 4 files changed, 126 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
