Merge branch 'master' into jacoco
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fb69ba3e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fb69ba3e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fb69ba3e Branch: refs/heads/jacoco Commit: fb69ba3e9052134b55392431ce9dfe6d879ac9d1 Parents: 29f5717 a679aea Author: Dave Johnson <snoopd...@apache.org> Authored: Tue Oct 20 13:42:54 2015 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Tue Oct 20 13:42:54 2015 -0400 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
