Merge branch '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/16c27077 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/16c27077 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/16c27077 Branch: refs/heads/master Commit: 16c270774d74c403b1e6a20604f8c7280d251911 Parents: 949c2bb bcc9780 Author: Michael Russo <[email protected]> Authored: Mon Feb 29 18:14:48 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Mon Feb 29 18:14:48 2016 -0800 ---------------------------------------------------------------------- .../asyncevents/AsyncEventServiceImpl.java | 7 ++----- .../usergrid/persistence/queue/LocalQueueManager.java | 6 +----- .../org/apache/usergrid/persistence/queue/QueueFig.java | 4 ++-- .../apache/usergrid/persistence/queue/QueueManager.java | 6 +----- .../persistence/queue/impl/SNSQueueManagerImpl.java | 12 +++++++----- .../usergrid/persistence/queue/QueueManagerTest.java | 10 +++++----- .../shiro/credentials/ApplicationAccessToken.java | 3 +++ .../shiro/credentials/OrganizationAccessToken.java | 3 +++ .../usergrid/services/notifications/QueueListener.java | 2 +- .../usergrid/services/queues/ImportQueueManager.java | 4 +--- .../apache/usergrid/services/queues/QueueListener.java | 2 +- 11 files changed, 27 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
