Merge branch '2.1-release' into multitenant-migration
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b816a188 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b816a188 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b816a188 Branch: refs/heads/USERGRID-909 Commit: b816a188bade82ec1044e4dfb80220da67182b3c Parents: 8af152e c652171 Author: Dave Johnson <[email protected]> Authored: Thu Oct 29 20:24:14 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Oct 29 20:24:14 2015 -0400 ---------------------------------------------------------------------- .../corepersistence/index/IndexServiceImpl.java | 2 +- .../persistence/index/CandidateResult.java | 11 +- .../persistence/index/EntityIndexBatch.java | 2 +- .../usergrid/persistence/index/IndexFig.java | 6 + .../index/impl/DeIndexOperation.java | 5 + .../index/impl/EsEntityIndexBatchImpl.java | 34 ++++- .../index/impl/EsEntityIndexImpl.java | 149 +++++++++++-------- .../persistence/index/impl/IndexingUtils.java | 2 +- .../persistence/index/impl/EntityIndexTest.java | 14 +- 9 files changed, 143 insertions(+), 82 deletions(-) ----------------------------------------------------------------------
