Merge commit 'refs/pull/534/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/38909ada Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/38909ada Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/38909ada Branch: refs/heads/master Commit: 38909adaa0e6332f3fdb198a5bd394009d7213d4 Parents: cc7a867 48780f0 Author: Michael Russo <[email protected]> Authored: Mon Jun 6 10:51:59 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Mon Jun 6 10:51:59 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 2 +- .../corepersistence/EntityManagerFig.java | 2 +- .../asyncevents/AsyncEventService.java | 6 +- .../asyncevents/AsyncEventServiceImpl.java | 11 +- .../asyncevents/EventBuilder.java | 6 +- .../asyncevents/EventBuilderImpl.java | 46 ++++--- .../model/DeIndexOldVersionsEvent.java | 12 +- .../corepersistence/index/IndexService.java | 23 +++- .../corepersistence/index/IndexServiceImpl.java | 86 +++++++------ .../collection/EntityCollectionManager.java | 10 +- .../impl/EntityCollectionManagerImpl.java | 40 +++++- .../serialization/SerializationFig.java | 5 + .../serialization/impl/LogEntryIterator.java | 128 +++++++++++++++++++ .../usergrid/persistence/index/EntityIndex.java | 5 +- .../usergrid/persistence/index/IndexFig.java | 2 +- .../index/impl/EsEntityIndexImpl.java | 64 +++------- .../persistence/index/impl/EntityIndexTest.java | 41 ------ 17 files changed, 320 insertions(+), 169 deletions(-) ----------------------------------------------------------------------
