You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2015/05/20 19:53:55 UTC
[1/2] curator git commit: Merge branch 'CURATOR-186' into
CURATOR-3.0-temp
Repository: curator
Updated Branches:
refs/heads/CURATOR-3.0-temp [created] c0cbfe2ef
Merge branch 'CURATOR-186' into CURATOR-3.0-temp
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/11af0738
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/11af0738
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/11af0738
Branch: refs/heads/CURATOR-3.0-temp
Commit: 11af0738d8847443ee62fbbe3941363c2514c4c5
Parents: 20e92a5 6d5136e
Author: randgalt <ra...@apache.org>
Authored: Wed May 20 10:51:19 2015 -0700
Committer: randgalt <ra...@apache.org>
Committed: Wed May 20 10:51:19 2015 -0700
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
.../framework/recipes/leader/ChaosMonkeyCnxnFactory.java | 7 -------
curator-test/pom.xml | 4 ++--
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
curator-x-rpc/pom.xml | 4 ++--
pom.xml | 6 +++---
10 files changed, 18 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/11af0738/curator-x-discovery/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/11af0738/curator-x-rpc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/11af0738/pom.xml
----------------------------------------------------------------------
[2/2] curator git commit: Merge branch 'CURATOR-215' into
CURATOR-3.0-temp
Posted by ra...@apache.org.
Merge branch 'CURATOR-215' into CURATOR-3.0-temp
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c0cbfe2e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c0cbfe2e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c0cbfe2e
Branch: refs/heads/CURATOR-3.0-temp
Commit: c0cbfe2ef88d10ff59c1d8a5352e411aa7e8a6ca
Parents: 11af073 f1e6183
Author: randgalt <ra...@apache.org>
Authored: Wed May 20 10:52:01 2015 -0700
Committer: randgalt <ra...@apache.org>
Committed: Wed May 20 10:52:01 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/curator/RetryLoop.java | 3 +-
.../curator/ensemble/EnsembleListener.java | 24 +
.../dynamic/DynamicEnsembleProvider.java | 61 +++
.../java/framework/TransactionExamples.java | 50 +-
.../curator/framework/CuratorFramework.java | 35 +-
.../api/AddStatConfigEnsembleable.java | 32 ++
.../apache/curator/framework/api/Addable.java | 43 ++
.../framework/api/AsyncReconfigurable.java | 29 ++
.../framework/api/BackgroundStatable.java | 24 +
.../curator/framework/api/Configurable.java | 31 ++
.../curator/framework/api/CuratorEvent.java | 7 +
.../curator/framework/api/CuratorEventType.java | 15 +
.../curator/framework/api/DataCallbackable.java | 32 ++
.../curator/framework/api/Ensembleable.java | 24 +
.../curator/framework/api/GetConfigBuilder.java | 29 ++
.../api/IncrementalReconfigBuilder.java | 33 ++
.../api/JoinAddStatConfigEnsembleable.java | 33 ++
.../api/JoinLeaveStatConfigEnsembleable.java | 33 ++
.../api/JoinStatConfigEnsembleable.java | 32 ++
.../framework/api/JoinStatConfigurable.java | 30 ++
.../apache/curator/framework/api/Joinable.java | 43 ++
.../api/LeaveAddStatConfigEnsembleable.java | 32 ++
.../api/LeaveStatConfigEnsembleable.java | 32 ++
.../apache/curator/framework/api/Leaveable.java | 41 ++
.../curator/framework/api/ReconfigBuilder.java | 28 ++
.../framework/api/ReconfigBuilderMain.java | 27 +
.../framework/api/StatConfigEnsembleable.java | 26 +
.../curator/framework/api/StatEnsembleable.java | 26 +
.../framework/api/SyncReconfigurable.java | 30 ++
.../transaction/CuratorMultiTransaction.java | 27 +
.../CuratorMultiTransactionMain.java | 45 ++
.../framework/api/transaction/CuratorOp.java | 31 ++
.../api/transaction/CuratorTransaction.java | 13 +-
.../transaction/CuratorTransactionResult.java | 11 +-
.../api/transaction/OperationType.java | 8 +-
.../transaction/TransactionCheckBuilder.java | 6 +-
.../transaction/TransactionCreateBuilder.java | 10 +-
.../transaction/TransactionDeleteBuilder.java | 6 +-
.../api/transaction/TransactionOp.java | 56 +++
.../transaction/TransactionSetDataBuilder.java | 8 +-
.../framework/api/transaction/TypeAndPath.java | 41 ++
.../framework/ensemble/EnsembleTracker.java | 191 +++++++
.../framework/imps/BackgroundSyncImpl.java | 2 +-
.../framework/imps/CreateBuilderImpl.java | 19 +-
.../framework/imps/CuratorEventImpl.java | 35 +-
.../framework/imps/CuratorFrameworkImpl.java | 36 +-
.../imps/CuratorMultiTransactionImpl.java | 163 ++++++
.../imps/CuratorMultiTransactionRecord.java | 17 +-
.../framework/imps/CuratorTransactionImpl.java | 149 +++---
.../framework/imps/DeleteBuilderImpl.java | 113 ++---
.../framework/imps/ExistsBuilderImpl.java | 2 +-
.../framework/imps/ExtractingCuratorOp.java | 54 ++
.../framework/imps/GetACLBuilderImpl.java | 2 +-
.../framework/imps/GetChildrenBuilderImpl.java | 2 +-
.../framework/imps/GetConfigBuilderImpl.java | 187 +++++++
.../framework/imps/GetDataBuilderImpl.java | 2 +-
.../framework/imps/ReconfigBuilderImpl.java | 504 +++++++++++++++++++
.../framework/imps/SetACLBuilderImpl.java | 2 +-
.../framework/imps/SetDataBuilderImpl.java | 23 +-
.../curator/framework/imps/SyncBuilderImpl.java | 2 +-
.../framework/imps/TransactionOpImpl.java | 65 +++
.../src/site/confluence/index.confluence | 23 +-
.../imps/TestCompressionInTransaction.java | 157 ------
.../imps/TestCompressionInTransactionNew.java | 162 ++++++
.../imps/TestCompressionInTransactionOld.java | 158 ++++++
.../framework/imps/TestFrameworkEdges.java | 1 +
.../framework/imps/TestReconfiguration.java | 417 +++++++++++++++
.../framework/imps/TestTransactions.java | 139 -----
.../framework/imps/TestTransactionsNew.java | 218 ++++++++
.../framework/imps/TestTransactionsOld.java | 141 ++++++
.../org/apache/curator/test/InstanceSpec.java | 4 +
.../curator/test/QuorumConfigBuilder.java | 2 +-
.../org/apache/curator/test/TestingCluster.java | 1 +
src/site/confluence/utilities.confluence | 5 +
74 files changed, 3581 insertions(+), 564 deletions(-)
----------------------------------------------------------------------