[37/50] 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/b3939acd Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3939acd Diff:

[36/50] 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/6d41d4a8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6d41d4a8 Diff:

[21/50] 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/8e7fbac8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8 Diff:

[18/50] 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/540cd28a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/540cd28a Diff:

[45/50] 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/00ffe779 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/00ffe779 Diff:

[29/50] 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/d7a65ad5 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d7a65ad5 Diff:

[10/50] 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/b58cfd06 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b58cfd06 Diff:

[25/50] 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/83636928 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928 Diff:

[14/50] 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/90b39dd8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/90b39dd8 Diff:

[07/50] 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/da48ef38 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da48ef38 Diff:

[3/4] 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/00ffe779 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/00ffe779 Diff:

[3/3] 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/00ffe779 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/00ffe779 Diff:

[3/6] 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/191aca24 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/191aca24 Diff:

[3/3] 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/191aca24 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/191aca24 Diff:

[48/50] 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/b3939acd Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3939acd Diff:

[36/50] 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/0e23fbac Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0e23fbac Diff:

[03/50] 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/8e7fbac8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8 Diff:

[43/50] 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/850b6e4e Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/850b6e4e Diff:

[34/50] 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/7d44baee Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7d44baee Diff:

[11/50] 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/83636928 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928 Diff:

[45/50] 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/6d41d4a8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6d41d4a8 Diff:

[25/50] 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/d7a65ad5 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d7a65ad5 Diff:

[3/3] 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/b3939acd Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3939acd Diff:

[4/4] 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/6d41d4a8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6d41d4a8 Diff:

[6/6] 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/850b6e4e Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/850b6e4e Diff:

[5/8] 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/7d44baee Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7d44baee Diff:

[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/0e23fbac Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0e23fbac Diff:

[11/12] 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/d7a65ad5 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d7a65ad5 Diff:

[29/40] 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/5cf7d050 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5cf7d050 Diff:

[17/40] 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/770aa411 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/770aa411 Diff:

[27/40] 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/540cd28a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/540cd28a Diff:

[23/40] 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/90b39dd8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/90b39dd8 Diff:

[38/40] 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/83636928 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928 Diff:

[14/40] 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/b58cfd06 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b58cfd06 Diff:

[12/40] 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/da48ef38 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da48ef38 Diff:

[6/6] 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/83636928 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928 Diff:

[7/7] 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/8e7fbac8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8 Diff:

[6/6] 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/770aa411 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/770aa411 Diff:

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

[6/6] 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/da48ef38 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da48ef38 Diff:

[12/12] 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/67cebe5c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/67cebe5c Diff:

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

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/e6ed9996 Tree:

[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/905b062b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/905b062b Diff:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-client/src/main/java/org/apache/curator/ConnectionState.java curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java curator-client/src/main/java/org/apache/curator/RetryLoop.java

[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/693211e4 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/693211e4 Diff:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java pom.xml Project:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d94a54f7 Tree:

[11/19] 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/d828dc0a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d828dc0a Diff:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/37d2b2b0

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-client/pom.xml curator-examples/pom.xml curator-framework/pom.xml curator-recipes/pom.xml curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java

[4/4] 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/eefdf8ee Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/eefdf8ee Diff:

[3/3] 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/5ff8aaae Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5ff8aaae Diff:

[3/3] 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/20c6955b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/20c6955b Diff:

[3/3] 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/41a70042 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/41a70042 Diff:

[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/073ed35b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/073ed35b Diff:

[3/3] 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/80c497c6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/80c497c6 Diff:

[4/4] 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/48e2c15b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/48e2c15b Diff:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-client/pom.xml curator-examples/pom.xml curator-framework/pom.xml curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java

[32/33] 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/f7ef2f1e Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f7ef2f1e Diff:

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

http://git-wip-us.apache.org/repos/asf/curator/blob/062a7d75/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java -- diff --cc

[3/3] 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/f7ef2f1e Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f7ef2f1e Diff:

[5/5] 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/88da05c0 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/88da05c0 Diff:

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

http://git-wip-us.apache.org/repos/asf/curator/blob/062a7d75/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java -- diff --cc

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

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4e4072b0 Tree:

curator git commit: Merge branch 'master' into CURATOR-3.0

Repository: curator Updated Branches: refs/heads/3.0-help [created] 6acf09871 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/6acf0987 Tree:

[3/3] 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/6acf0987 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6acf0987 Diff:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c6a22ba5

[3/3] 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/75325d4a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/75325d4a Diff:

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-client/src/main/java/org/apache/curator/RetryLoop.java curator-framework/src/main/java/org/apache/curator/framework/imps/FailedDeleteManager.java

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

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/59814189 Tree:

[8/8] 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/ac5c1326 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ac5c1326 Diff:

[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:

[4/4] 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/9a9e18e2 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9a9e18e2 Diff:

[3/3] 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/df949e7a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/df949e7a Diff:

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

[5/5] 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/24de710d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/24de710d Diff:

[5/5] 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/793ed89b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/793ed89b Diff:

[39/45] 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/d01eabe5 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d01eabe5 Diff:

[12/14] 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/d01eabe5 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d01eabe5 Diff:

[3/3] 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/f9af0ce8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f9af0ce8 Diff:

[2/3] 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/f9af0ce8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f9af0ce8 Diff:

[9/9] 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/3016ce2f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3016ce2f Diff:

[09/10] 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/3016ce2f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3016ce2f Diff: