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/ba9e9dbc Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ba9e9dbc Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ba9e9dbc Branch: refs/heads/two-dot-o-dev Commit: ba9e9dbc78908fe5602a60f3d765ff6e96e14775 Parents: 154d69d 69610b0 Author: Todd Nine <tn...@apigee.com> Authored: Mon Apr 27 16:11:05 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Mon Apr 27 16:11:05 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/index/AsyncIndexProvider.java | 3 ++- .../index/InMemoryAsyncIndexService.java | 13 ++++++++++--- .../corepersistence/index/IndexProcessorFig.java | 3 +++ .../index/InMemoryAsycIndexServiceTest.java | 2 +- .../src/test/resources/usergrid-custom-test.properties | 1 + .../persistence/core/future/FutureObservable.java | 7 ------- .../usergrid/persistence/core/astyanax/TestUtils.java | 2 +- .../graph/impl/stage/EdgeDeleteRepairImpl.java | 3 ++- .../graph/impl/stage/EdgeMetaRepairImpl.java | 6 ++++-- .../serialization/impl/shard/DirectedEdgeMeta.java | 2 +- .../graph/impl/stage/EdgeDeleteRepairTest.java | 6 ++++-- .../persistence/graph/test/util/EdgeTestUtils.java | 6 +++--- 12 files changed, 32 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
