Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/72016ea8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/72016ea8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/72016ea8 Branch: refs/heads/two-dot-o-dev Commit: 72016ea89c05f920059fd15861a5b40d945ecfbc Parents: 2707dbf daac07d Author: Dave Johnson <snoopd...@apache.org> Authored: Mon Aug 17 11:12:50 2015 -0700 Committer: Dave Johnson <snoopd...@apache.org> Committed: Mon Aug 17 11:12:50 2015 -0700 ---------------------------------------------------------------------- .../asyncevents/AmazonAsyncEventService.java | 7 +- .../asyncevents/AsyncEventService.java | 7 + .../asyncevents/InMemoryAsyncEventService.java | 12 +- .../persistence/queue/DefaultQueueManager.java | 5 + .../persistence/queue/QueueManager.java | 6 + .../queue/impl/SNSQueueManagerImpl.java | 14 ++ .../queue/impl/SQSQueueManagerImpl.java | 31 ++-- .../persistence/queue/QueueManagerTest.java | 24 +++ .../org/apache/usergrid/rest/RootResource.java | 19 ++- stack/scripts/migrate_entity_data.py | 155 ++++++++++++++----- .../services/queues/ImportQueueManager.java | 5 + 11 files changed, 219 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
