Merge branch 'master' of github.com:apache/usergrid into Usergrid1310
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1a83bfc6 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1a83bfc6 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1a83bfc6 Branch: refs/heads/asf-site Commit: 1a83bfc6edab1670cf6b00e5184beaa811b11f6c Parents: b1157a8 2a514d4 Author: Ayesha Dastagiri <[email protected]> Authored: Thu Aug 11 12:48:23 2016 -0700 Committer: Ayesha Dastagiri <[email protected]> Committed: Thu Aug 11 12:48:23 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 33 +++++++++++++-- .../corepersistence/CpEntityManagerFactory.java | 9 ++-- .../usergrid/persistence/PersistenceModule.java | 12 +++--- .../applications/events/EventsResource.java | 6 +-- .../rest/exceptions/RuntimeExceptionMapper.java | 43 ++++++++++++++++++++ .../rest/management/ManagementResource.java | 34 ++++++++++------ .../rest/management/users/UserResource.java | 40 +++++++++--------- .../rest/management/users/UsersResource.java | 5 ++- .../applications/events/EventsResourceIT.java | 32 +++++++-------- .../rest/management/ExternalSSOEnabledIT.java | 2 +- .../rest/management/ManagementResourceIT.java | 6 ++- .../usergrid/management/ManagementService.java | 2 +- .../cassandra/ManagementServiceImpl.java | 17 ++++---- .../security/sso/ApigeeSSO2Provider.java | 9 +++- .../tokens/cassandra/TokenServiceImpl.java | 2 +- 15 files changed, 170 insertions(+), 82 deletions(-) ----------------------------------------------------------------------
