Merge commit 'refs/pull/487/head' of github.com:apache/usergrid into 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/ee356ec7 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ee356ec7 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ee356ec7 Branch: refs/heads/master Commit: ee356ec75da3c72a0cd51a501de62b9bde3bcd58 Parents: 583c104 5dfbcca Author: Michael Russo <[email protected]> Authored: Thu Feb 25 11:55:42 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Feb 25 11:55:42 2016 -0800 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 4 +- .../asyncevents/AmazonAsyncEventService.java | 844 ------------------- .../asyncevents/AsyncEventService.java | 5 +- .../asyncevents/AsyncEventServiceImpl.java | 829 ++++++++++++++++++ .../asyncevents/AsyncIndexProvider.java | 4 +- .../asyncevents/EventBuilder.java | 12 +- .../asyncevents/EventBuilderImpl.java | 15 +- .../asyncevents/IndexDocNotFoundException.java | 37 + .../asyncevents/model/AsyncEvent.java | 2 - .../asyncevents/model/EdgeIndexEvent.java | 70 -- .../asyncevents/model/EntityIndexEvent.java | 54 -- .../corepersistence/index/IndexServiceImpl.java | 4 +- .../read/search/CandidateEntityFilter.java | 10 +- .../index/AmazonAsyncEventServiceTest.java | 103 --- .../index/AsyncEventServiceImplTest.java | 103 +++ .../index/AsyncIndexServiceTest.java | 3 +- .../index/impl/EsIndexProducerImpl.java | 5 +- .../usergrid/persistence/queue/QueueFig.java | 4 + .../usergrid/services/ServiceManager.java | 5 +- 19 files changed, 1003 insertions(+), 1110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee356ec7/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ----------------------------------------------------------------------
