Merge branch 'CURATOR-179'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b3fb2cfe Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3fb2cfe Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b3fb2cfe Branch: refs/heads/master Commit: b3fb2cfee9ada524edb6319c327bfcf4fd0c0320 Parents: dad2888 9098606 Author: Cameron McKenzie <came...@unico.com.au> Authored: Tue Jan 13 10:04:02 2015 +1100 Committer: Cameron McKenzie <came...@unico.com.au> Committed: Tue Jan 13 10:04:02 2015 +1100 ---------------------------------------------------------------------- .../java/org/apache/curator/utils/ZKPaths.java | 15 ++++++++++++++- .../curator/framework/imps/CreateBuilderImpl.java | 2 +- .../framework/imps/CuratorFrameworkImpl.java | 7 ++++++- .../curator/framework/imps/NamespaceFacade.java | 8 +++++++- .../curator/framework/imps/NamespaceImpl.java | 6 +++--- .../curator/framework/imps/TestFramework.java | 18 ++++++++++++++++++ 6 files changed, 49 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/b3fb2cfe/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/b3fb2cfe/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/b3fb2cfe/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java ----------------------------------------------------------------------