Repository: curator
Updated Branches:
refs/heads/CURATOR-3.0 d034aeaed -> d8798c21d
[CURATOR-349] Expose extra metrics in TracerDriver
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2f6e2177
Tree:
Merge branch 'CURATOR-349' of github.com:lvfangmin/curator into CURATOR-349
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b51bb011
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b51bb011
Diff:
CURATOR-356 Allow SASL configuration for TestingServer
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/dd20f1db
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/dd20f1db
Diff:
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
Repository: curator
Updated Branches:
refs/heads/master b51bb0117 -> dd20f1dbe
CURATOR-356 Allow SASL configuration for TestingServer
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/dd20f1db
Tree: