curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [7/7] curator git commit: Merge branch 'CURATOR-3.0' into CURATOR-266
Date Fri, 09 Oct 2015 00:12:24 GMT
Merge branch 'CURATOR-3.0' into CURATOR-266

Conflicts:
	curator-framework/src/main/java/org/apache/curator/framework/imps/NamespaceFacade.java


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/779ff5ea
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/779ff5ea
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/779ff5ea

Branch: refs/heads/CURATOR-3.0
Commit: 779ff5ea459ce8d60c92db1c3fde2966d1cc3e3a
Parents: b89091e 0fe4d96
Author: randgalt <randgalt@apache.org>
Authored: Thu Oct 8 19:11:56 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Thu Oct 8 19:11:56 2015 -0500

----------------------------------------------------------------------
 .../apache/curator/CuratorZookeeperClient.java  |   2 +-
 .../curator/framework/api/CreateBuilder.java    |  65 +----------
 .../framework/api/CreateBuilderMain.java        |  86 ++++++++++++++
 .../curator/framework/api/DeleteBuilder.java    |   4 +-
 .../framework/api/DeleteBuilderMain.java        |  23 ++++
 .../framework/imps/CreateBuilderImpl.java       |  61 ++++++++++
 .../framework/imps/DeleteBuilderImpl.java       |  21 ++++
 .../curator/framework/imps/NamespaceFacade.java |  13 ---
 .../curator/framework/imps/TestFramework.java   | 117 +++++++++++++++++++
 9 files changed, 314 insertions(+), 78 deletions(-)
----------------------------------------------------------------------



Mime
View raw message