curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [08/12] curator git commit: wip
Date Wed, 13 May 2015 12:04:24 GMT
wip


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7d038ad5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7d038ad5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7d038ad5

Branch: refs/heads/CURATOR-3.0
Commit: 7d038ad5c5914c5b31861e24d59a46797ab02cf7
Parents: 471610c
Author: randgalt <randgalt@apache.org>
Authored: Tue May 12 14:10:34 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Tue May 12 14:10:34 2015 -0500

----------------------------------------------------------------------
 .../curator/framework/imps/CuratorMultiTransactionImpl.java      | 3 ---
 curator-framework/src/site/confluence/index.confluence           | 4 ----
 2 files changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/7d038ad5/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
index 6881fc2..577b0d6 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
@@ -38,9 +38,6 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 
-/**
- * @deprecated Use {@link CuratorFramework#transaction()}
- */
 public class CuratorMultiTransactionImpl implements
     CuratorMultiTransaction,
     CuratorMultiTransactionMain,

http://git-wip-us.apache.org/repos/asf/curator/blob/7d038ad5/curator-framework/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/curator-framework/src/site/confluence/index.confluence b/curator-framework/src/site/confluence/index.confluence
index b065f00..b79ece4 100644
--- a/curator-framework/src/site/confluence/index.confluence
+++ b/curator-framework/src/site/confluence/index.confluence
@@ -42,16 +42,12 @@ h3. Methods
 |getData()|Begins an operation to get a ZNode's data. Call additional methods (watch, background
or get stat) and finalize the operation by calling forPath()|
 |setData()|Begins an operation to set a ZNode's data. Call additional methods (version or
background) and finalize the operation by calling forPath()|
 |getChildren()|Begins an operation to get a ZNode's list of children ZNodes. Call additional
methods (watch, background or get stat) and finalize the operation by calling forPath()|
-<<<<<<< HEAD
 |transactionOp()|Used to allocate operations to be used with transaction().|
 |transaction()|Atomically submit a set of operations as a transaction.|
-=======
-|inTransaction()|Begins an atomic ZooKeeper transaction. Combine create, setData, check,
and/or delete operations and then commit() as a unit.|
 |getACL()|Begins an operation to return a ZNode's ACL settings. Call additional methods and
finalize the operation by calling forPath()|
 |setACL()|Begins an operation to set a ZNode's ACL settings. Call additional methods and
finalize the operation by calling forPath()|
 |getConfig()|Begins an operation to return the last committed configuration. Call additional
methods and finalize the operation by calling forEnsemble()|
 |reconfig()|Begins an operation to change the configuration. Call additional methods and
finalize the operation by calling forEnsemble()|
->>>>>>> CURATOR-3.0
 
 h3. Notifications
 Notifications for background operations and watches are published via the ClientListener
interface. You register listeners with the


Mime
View raw message