You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/05/04 19:33:00 UTC
[10/12] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-dev
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/4107ef38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4107ef38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4107ef38
Branch: refs/heads/USERGRID-609
Commit: 4107ef38961dceecaf90c03edfed0d43dc67486b
Parents: 6d4847a d18b8ee
Author: Todd Nine <tn...@apigee.com>
Authored: Mon May 4 11:27:38 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon May 4 11:27:38 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 34 ++---
.../usergrid/persistence/EntityManagerIT.java | 4 +-
.../graph/impl/SimpleSearchByEdge.java | 5 +-
.../usergrid/persistence/index/IndexFig.java | 11 +-
.../persistence/index/IndexRefreshCommand.java | 2 +-
.../index/impl/EsEntityIndexImpl.java | 2 +-
.../index/impl/IndexRefreshCommandImpl.java | 136 +++++++++++--------
.../persistence/index/impl/EntityIndexTest.java | 123 ++++++++---------
8 files changed, 173 insertions(+), 144 deletions(-)
----------------------------------------------------------------------