usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [14/14] incubator-usergrid git commit: Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-252
Date Wed, 10 Dec 2014 00:31:54 GMT
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 <tnine@apigee.com>
Authored: Tue Dec 9 17:31:33 2014 -0700
Committer: Todd Nine <tnine@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(-)
----------------------------------------------------------------------



Mime
View raw message