Merge branch 'CURATOR-111'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/5ded39fa Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5ded39fa Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5ded39fa Branch: refs/heads/master Commit: 5ded39fa529f4359032fced16a7a537f538b2598 Parents: 674f394 9d61c12 Author: randgalt <[email protected]> Authored: Tue Jan 13 07:49:21 2015 -0500 Committer: randgalt <[email protected]> Committed: Tue Jan 13 07:49:21 2015 -0500 ---------------------------------------------------------------------- .../framework/CuratorFrameworkFactory.java | 47 +++++++++++-- .../framework/imps/CuratorFrameworkImpl.java | 4 -- .../curator/framework/imps/TestFramework.java | 73 +++++++++++++++----- 3 files changed, 97 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/5ded39fa/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/5ded39fa/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java ----------------------------------------------------------------------
