Merge branch 'CURATOR-3.0' into CURATOR-261
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/afa8f7a4 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/afa8f7a4 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/afa8f7a4 Branch: refs/heads/CURATOR-3.0 Commit: afa8f7a45b1cc154317ac757d20340ce26b9cdab Parents: f6734ca ea36769 Author: randgalt <randg...@apache.org> Authored: Fri Sep 25 19:19:05 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Fri Sep 25 19:19:05 2015 -0500 ---------------------------------------------------------------------- .../ClassicConnectionHandlingPolicy.java | 4 +- .../connection/ConnectionHandlingPolicy.java | 27 +++++++++++-- .../StandardConnectionHandlingPolicy.java | 17 +++++++- .../imps/ClassicInternalConnectionHandler.java | 6 --- .../framework/imps/CreateBuilderImpl.java | 24 ++++++------ .../framework/imps/CuratorFrameworkImpl.java | 7 ++-- .../imps/InternalConnectionHandler.java | 2 - .../imps/StandardInternalConnectionHandler.java | 6 --- .../framework/state/ConnectionStateManager.java | 13 ++++--- .../framework/imps/TestFrameworkEdges.java | 41 ++++++++++++++++++++ 10 files changed, 105 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
