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/fafaa4e7 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fafaa4e7 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fafaa4e7 Branch: refs/heads/master Commit: fafaa4e74d9fb59c96eb9bdd46a7ceb5ca25f4a7 Parents: 16c2707 5dee6c8 Author: Michael Russo <[email protected]> Authored: Tue Mar 1 14:55:10 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Tue Mar 1 14:55:10 2016 -0800 ---------------------------------------------------------------------- .../collection/impl/EntityCollectionManagerImpl.java | 8 ++++++-- .../org/apache/usergrid/persistence/queue/QueueFig.java | 3 +++ .../persistence/queue/impl/SNSQueueManagerImpl.java | 10 +++++++--- .../shiro/credentials/ApplicationAccessToken.java | 2 +- .../shiro/credentials/OrganizationAccessToken.java | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
