Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-587
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/294a7d90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/294a7d90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/294a7d90 Branch: refs/heads/two-dot-o-dev Commit: 294a7d900784283ff7c038585728418d799b7010 Parents: cd983d6 faafa37 Author: Todd Nine <[email protected]> Authored: Thu Apr 30 17:41:05 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Thu Apr 30 17:41:05 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 | 2 +- 8 files changed, 112 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/294a7d90/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ----------------------------------------------------------------------
