You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/26 22:20:57 UTC
[13/35] git commit: Merge branch 'hystrix-integration' into asyncqueue
Merge branch 'hystrix-integration' into asyncqueue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/51381a36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/51381a36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/51381a36
Branch: refs/heads/asyncqueue
Commit: 51381a36e5dbdda7830ac13e2b2e5df0f32bdc20
Parents: aae2a8d b1d12a1
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 25 12:35:13 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 25 12:35:13 2014 -0700
----------------------------------------------------------------------
stack/corepersistence/collection/pom.xml | 6 +
.../collection/guice/CollectionModule.java | 8 +-
.../impl/EntityCollectionManagerImpl.java | 19 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 14 +-
.../collection/rx/CassandraThreadScheduler.java | 107 --
.../persistence/collection/rx/RxFig.java | 42 -
.../stage/write/WriteUniqueVerifyStageTest.java | 3 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 6 +-
.../rx/CassandraThreadSchedulerTest.java | 413 -----
.../persistence/collection/rx/ParallelTest.java | 6 +-
.../usergrid/persistence/graph/GraphFig.java | 42 +-
.../graph/consistency/AsyncProcessorImpl.java | 6 +-
.../graph/consistency/TimeoutTask.java | 2 +-
.../graph/hystrix/HystrixGraphObservable.java | 52 +
.../graph/impl/EdgeDeleteListener.java | 6 +-
.../persistence/graph/impl/EdgeManagerImpl.java | 46 +-
.../graph/impl/EdgeWriteListener.java | 2 +-
.../graph/impl/NodeDeleteListener.java | 33 +-
.../graph/impl/stage/AbstractEdgeRepair.java | 21 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 4 +-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 22 +-
.../graph/impl/stage/EdgeWriteRepairImpl.java | 4 +-
.../impl/EdgeMetadataSerializationImpl.java | 17 +-
.../impl/EdgeSerializationImpl.java | 21 +-
.../impl/parse/ColumnNameIterator.java | 55 +-
.../persistence/graph/EdgeManagerTimeoutIT.java | 1562 ++++++++++++++++++
.../graph/consistency/AsyncProcessorTest.java | 2 +-
.../graph/test/util/EdgeTestUtils.java | 17 +-
stack/corepersistence/pom.xml | 1 +
29 files changed, 1806 insertions(+), 733 deletions(-)
----------------------------------------------------------------------