[1/4] curator git commit: [CURATOR-349] Expose extra metrics in TracerDriver

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

[2/4] curator git commit: Merge branch 'CURATOR-349' of github.com:lvfangmin/curator into CURATOR-349

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

[3/4] curator git commit: CURATOR-356 Allow SASL configuration for TestingServer

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

[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

curator git commit: CURATOR-356 Allow SASL configuration for TestingServer

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