Merge branch 'master' into USERGRID-872
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/41caeaa1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/41caeaa1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/41caeaa1 Branch: refs/heads/USERGRID-872 Commit: 41caeaa1033700b2a60325cdd5c98fca46a95c55 Parents: 41a6cea 2867d26 Author: Dave Johnson <[email protected]> Authored: Mon Jan 4 08:31:02 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Mon Jan 4 08:31:02 2016 -0500 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 30 +++++--- .../persistence/entities/Notification.java | 10 ++- .../persistence/query/ParenthesisProblemIT.java | 81 ++++++++++++++++++++ .../persistence/cache/ScopedCacheTest.java | 15 ++-- .../rest/applications/ServiceResource.java | 59 ++++++++++---- .../rest/applications/users/UsersResource.java | 19 +++-- .../rest/test/resource/AbstractRestIT.java | 10 ++- .../cassandra/ManagementServiceImpl.java | 55 +++++++++---- .../notifications/NotificationsService.java | 4 +- .../apns/NotificationsServiceIT.java | 50 ++++++++++++ 10 files changed, 278 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
