Merge branch '2.1-release' 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/a679aea4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a679aea4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a679aea4 Branch: refs/heads/jacoco Commit: a679aea4a46f29c60e64bfdf8e484149450c1fea Parents: e7c805f a09485a Author: Shawn Feldman <[email protected]> Authored: Tue Oct 20 09:17:19 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Oct 20 09:17:19 2015 -0600 ---------------------------------------------------------------------- .../asyncevents/AmazonAsyncEventService.java | 40 ++--- .../asyncevents/AsyncIndexProvider.java | 10 +- .../asyncevents/model/AsyncEvent.java | 14 +- .../asyncevents/model/EdgeDeleteEvent.java | 6 +- .../asyncevents/model/EdgeIndexEvent.java | 9 +- .../asyncevents/model/EntityDeleteEvent.java | 8 +- .../asyncevents/model/EntityIndexEvent.java | 6 +- .../model/InitializeApplicationIndexEvent.java | 4 +- .../index/IndexProcessorFig.java | 7 +- .../index/AmazonAsyncEventServiceTest.java | 6 +- .../cache/CachedEntityCollectionManager.java | 147 ------------------- .../EntityCollectionManagerFactoryImpl.java | 6 - .../usergrid/persistence/queue/QueueFig.java | 8 +- .../queue/impl/SNSQueueManagerImpl.java | 8 +- .../queue/impl/SQSQueueManagerImpl.java | 2 +- .../queue/util/AmazonNotificationUtils.java | 4 +- 16 files changed, 74 insertions(+), 211 deletions(-) ----------------------------------------------------------------------
