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: http://git-wip-us.apache.org/repos/asf/curator/diff/b51bb011 Branch: refs/heads/CURATOR-3.0 Commit: b51bb01176940896cad5408a453c524fcfe0fc49 Parents: 8c1b4be 2f6e217 Author: randgalt <randg...@apache.org> Authored: Tue Oct 25 10:14:04 2016 -0500 Committer: randgalt <randg...@apache.org> Committed: Tue Oct 25 10:14:04 2016 -0500 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 37 ++++- .../apache/curator/CuratorZookeeperClient.java | 15 +- .../main/java/org/apache/curator/RetryLoop.java | 7 +- .../curator/drivers/AdvancedTracerDriver.java | 50 ++++++ .../org/apache/curator/drivers/EventTrace.java | 53 ++++++ .../apache/curator/drivers/OperationTrace.java | 162 +++++++++++++++++++ .../framework/imps/BackgroundSyncImpl.java | 11 +- .../framework/imps/CreateBuilderImpl.java | 17 +- .../framework/imps/CuratorFrameworkImpl.java | 4 +- .../framework/imps/DeleteBuilderImpl.java | 10 +- .../framework/imps/ExistsBuilderImpl.java | 14 +- .../FindAndDeleteProtectedNodeInBackground.java | 6 +- .../framework/imps/GetACLBuilderImpl.java | 10 +- .../framework/imps/GetChildrenBuilderImpl.java | 10 +- .../framework/imps/GetDataBuilderImpl.java | 10 +- .../framework/imps/SetACLBuilderImpl.java | 10 +- .../framework/imps/SetDataBuilderImpl.java | 13 +- .../curator/framework/imps/SyncBuilderImpl.java | 6 +- .../framework/imps/TempGetDataBuilderImpl.java | 6 +- src/site/confluence/logging.confluence | 2 +- 20 files changed, 380 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
