Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-609
# By Shawn Feldman # Via Shawn Feldman * 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: moving back to refresh its faster moving back to refresh its faster refresh to observable adding refresh back test passing null safety Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/264e67ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/264e67ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/264e67ff Branch: refs/heads/USERGRID-614 Commit: 264e67ff9d68d5c28290e0db219e315fdddcbb26 Parents: e4016d0 faafa37 Author: GERey <[email protected]> Authored: Fri May 1 09:48:45 2015 -0700 Committer: GERey <[email protected]> Committed: Fri May 1 09:48:45 2015 -0700 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
