Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/37373569 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/37373569 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/37373569 Branch: refs/heads/master Commit: 37373569eb29bd45e8942f2dc2322ee9c2980d50 Parents: c5308ae e0931be Author: Dave Johnson <[email protected]> Authored: Fri Apr 8 17:29:30 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri Apr 8 17:29:30 2016 -0400 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
