Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07b83e3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07b83e3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07b83e3b Branch: refs/heads/USERGRID-593 Commit: 07b83e3bffe9ff9577c167d5433640fe5c442c1d Parents: 7712f88 852c974 Author: Shawn Feldman <sfeld...@apache.org> Authored: Thu Apr 23 10:57:48 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Thu Apr 23 10:57:48 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/index/IndexServiceTest.java | 44 +++++--- stack/core/src/test/resources/log4j.properties | 1 + stack/corepersistence/pom.xml | 2 +- .../usergrid/persistence/index/IndexFig.java | 18 ++- .../persistence/index/impl/BatchOperation.java | 41 +++++++ .../persistence/index/impl/BatchRequest.java | 41 ------- .../index/impl/DeIndexOperation.java | 104 +++++++++++++++++ .../persistence/index/impl/DeIndexRequest.java | 104 ----------------- .../index/impl/EsEntityIndexBatchImpl.java | 4 +- .../index/impl/EsIndexBufferConsumerImpl.java | 107 ++++++++++-------- .../persistence/index/impl/IndexOperation.java | 107 ++++++++++++++++++ .../index/impl/IndexOperationMessage.java | 19 ++-- .../index/impl/IndexRefreshCommandImpl.java | 6 +- .../persistence/index/impl/IndexRequest.java | 111 ------------------- 14 files changed, 371 insertions(+), 338 deletions(-) ----------------------------------------------------------------------
