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/e0931be4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e0931be4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e0931be4 Branch: refs/heads/master Commit: e0931be422d75370a6c6e5d12764167ff446754e Parents: ce34a04 8435783 Author: Michael Russo <[email protected]> Authored: Thu Mar 10 20:47:25 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Mar 10 20:47:25 2016 -0800 ---------------------------------------------------------------------- .../asyncevents/AsyncEventServiceImpl.java | 105 ++++++++++--------- .../usergrid/persistence/queue/QueueFig.java | 2 +- .../persistence/queue/QueueMessage.java | 10 ++ .../queue/impl/SNSQueueManagerImpl.java | 7 ++ .../applications/ApplicationResource.java | 29 ++--- .../rest/applications/ApplicationDeleteIT.java | 17 +-- 6 files changed, 99 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
