Merge commit 'refs/pull/594/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a88a8752 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a88a8752 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a88a8752 Branch: refs/heads/master Commit: a88a875271d7789b6366d86d9d45418f70dd3e2b Parents: c172133 2b35733 Author: Mike Dunker <mdun...@google.com> Authored: Wed Dec 13 11:51:39 2017 -0800 Committer: Mike Dunker <mdun...@google.com> Committed: Wed Dec 13 11:51:39 2017 -0800 ---------------------------------------------------------------------- .../corepersistence/EntityManagerFig.java | 2 +- .../persistence/queue/LegacyQueueFig.java | 8 +- .../queue/impl/SNSQueueManagerImpl.java | 4 +- .../queue/util/AmazonNotificationUtils.java | 135 ++++++++++++++----- .../collection/CollectionsResourceIT.java | 6 +- 5 files changed, 111 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a88a8752/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/LegacyQueueFig.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a88a8752/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a88a8752/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java ----------------------------------------------------------------------
