Merge commit 'refs/pull/517/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/72c9df14 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/72c9df14 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/72c9df14 Branch: refs/heads/release-2.1.1 Commit: 72c9df14a4185a9dafe55255b9d2cda73ad27882 Parents: 0eaea98 9edfda6 Author: Michael Russo <[email protected]> Authored: Tue Jun 7 09:15:25 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Jun 7 09:15:25 2016 -0700 ---------------------------------------------------------------------- .../persistence/entities/Notification.java | 38 ++++++--- .../collection/CollectionsResourceIT.java | 87 ++++++++++++++++---- .../resource/endpoints/CollectionEndpoint.java | 24 +++--- .../impl/ApplicationQueueManagerImpl.java | 52 +++++++++--- .../AbstractServiceNotificationIT.java | 26 +++--- 5 files changed, 158 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
