curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [10/10] curator git commit: Merge branch 'master' into CURATOR-3.0
Date Mon, 11 Jan 2016 00:30:59 GMT
Merge branch 'master' into CURATOR-3.0


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

Branch: refs/heads/CURATOR-3.0
Commit: 100dd3f263c2e1f5e80cdce7e8f91fe1554c8e04
Parents: 5c34cb1 45332f3
Author: randgalt <randgalt@apache.org>
Authored: Sun Jan 10 19:30:39 2016 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Sun Jan 10 19:30:39 2016 -0500

----------------------------------------------------------------------
 .../framework/imps/CreateBuilderImpl.java       |  68 +-----------
 .../framework/imps/CuratorFrameworkImpl.java    |   5 +-
 .../FindAndDeleteProtectedNodeInBackground.java | 107 +++++++++++++++++++
 .../framework/imps/TestFrameworkEdges.java      |   1 +
 4 files changed, 117 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/100dd3f2/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
----------------------------------------------------------------------
diff --cc curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index 8a8787a,a9cb600..5622508
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@@ -24,8 -24,8 +24,7 @@@ import com.google.common.base.Predicate
  import com.google.common.collect.Iterables;
  import org.apache.curator.RetryLoop;
  import org.apache.curator.TimeTrace;
- import org.apache.curator.framework.CuratorFramework;
  import org.apache.curator.framework.api.*;
 -import org.apache.curator.framework.api.transaction.CuratorTransactionBridge;
  import org.apache.curator.framework.api.transaction.OperationType;
  import org.apache.curator.framework.api.transaction.TransactionCreateBuilder;
  import org.apache.curator.utils.ZKPaths;

http://git-wip-us.apache.org/repos/asf/curator/blob/100dd3f2/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/100dd3f2/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
----------------------------------------------------------------------


Mime
View raw message