You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2015/10/15 04:30:10 UTC

[2/2] curator git commit: Merge branch 'master' into CURATOR-3.0

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/1a240520
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/1a240520
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/1a240520

Branch: refs/heads/CURATOR-3.0
Commit: 1a240520f216801a5c2269956c86e92f15ed8f1b
Parents: c111118 a14b277
Author: Cam McKenzie <ca...@apache.org>
Authored: Thu Oct 15 13:28:37 2015 +1100
Committer: Cam McKenzie <ca...@apache.org>
Committed: Thu Oct 15 13:28:37 2015 +1100

----------------------------------------------------------------------
 .../java/org/apache/curator/framework/imps/SyncBuilderImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/1a240520/curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java
----------------------------------------------------------------------
diff --cc curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java
index cab31ae,09dfbae..be4d33a
mode 100644,100755..100755
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java