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

2017-03-20 Thread randgalt
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:

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

2016-10-26 Thread cammckenzie
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

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

2016-05-25 Thread dragonsinth
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:

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

2016-05-19 Thread randgalt
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:

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

2015-10-11 Thread randgalt
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: