You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/12/10 01:31:54 UTC
[14/14] incubator-usergrid git commit: Merge remote-tracking branch
'origin/two-dot-o' into USERGRID-252
Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-252
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/43ed8464
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43ed8464
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43ed8464
Branch: refs/heads/USERGRID-252
Commit: 43ed8464f81316619f3985a43fb61d2a0aa1c78a
Parents: 5d4ce72 04679c8
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Dec 9 17:31:33 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Dec 9 17:31:33 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 4 +-
.../persistence/index/AliasedEntityIndex.java | 48 ++++++++
.../usergrid/persistence/index/EntityIndex.java | 5 -
.../usergrid/persistence/index/IndexFig.java | 3 +
.../index/impl/EsEntityIndexBatchImpl.java | 38 +++++--
.../index/impl/EsEntityIndexImpl.java | 44 ++++---
.../persistence/index/impl/EsIndexCache.java | 114 +++++++++++++++++++
.../persistence/index/impl/EntityIndexTest.java | 61 +++++++---
8 files changed, 273 insertions(+), 44 deletions(-)
----------------------------------------------------------------------