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/159c8c32 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/159c8c32 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/159c8c32 Branch: refs/heads/master Commit: 159c8c32574e5afd8fc1d2ca0c2fb69b3daa38c2 Parents: 8536253 91739c6 Author: Michael Russo <[email protected]> Authored: Sat Feb 27 21:42:09 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Sat Feb 27 21:42:09 2016 -0800 ---------------------------------------------------------------------- .../asyncevents/AsyncEventService.java | 7 +++++ .../asyncevents/AsyncEventServiceImpl.java | 6 ++++ .../usergrid/persistence/queue/QueueFig.java | 10 +++++++ .../queue/impl/SNSQueueManagerImpl.java | 27 ++++++++++++----- .../org/apache/usergrid/rest/RootResource.java | 31 +++++++++++++++++--- 5 files changed, 69 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
