[30/43] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into collection_multiget

[sf...@apache.org]

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into collection_multiget

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/GetVersion.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a336b6b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a336b6b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a336b6b4

Branch: refs/heads/two-dot-o-events
Commit: a336b6b40ddfc4e39c6b92a0516dba0f626bc0d3
Parents: 454ef4f 8b0355f
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 9 16:03:40 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 9 16:03:40 2014 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |   3 -
 .../corepersistence/StaleIndexCleanupTest.java  |  51 +++---
 .../index/impl/EsEntityIndexBatchImpl.java      | 119 ++++++--------
 .../index/impl/EsEntityIndexImpl.java           | 154 +++++++------------
 .../persistence/index/impl/IndexingUtils.java   |  66 ++++++++
 5 files changed, 199 insertions(+), 194 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a336b6b4/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a336b6b4/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
----------------------------------------------------------------------