curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [8/8] curator git commit: Merge branch 'CURATOR-160' of github.com:iocanel/curator into CURATOR-160
Date Wed, 06 May 2015 05:00:55 GMT
Merge branch 'CURATOR-160' of github.com:iocanel/curator into CURATOR-160

Conflicts:
	curator-framework/src/main/java/org/apache/curator/framework/api/Configurable.java
	curator-framework/src/main/java/org/apache/curator/framework/api/ReconfigBuilder.java
	curator-framework/src/main/java/org/apache/curator/framework/imps/GetConfigBuilderImpl.java
	curator-framework/src/main/java/org/apache/curator/framework/imps/ReconfigBuilderImpl.java
	curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java


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

Branch: refs/heads/CURATOR-160
Commit: ea1a1684198ca2fa317486a881d5f48466fbf8f8
Parents: 36b9ed8 625441b
Author: randgalt <randgalt@apache.org>
Authored: Wed May 6 00:00:37 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Wed May 6 00:00:37 2015 -0500

----------------------------------------------------------------------
 .../api/BackgroundStatConfigEnsembleable.java   |  24 +++++
 .../api/BackgroundStatEnsembleable.java         |  24 +++++
 .../curator/framework/api/Configurable.java     |   2 +-
 .../JoinBackgroundStatConfigEnsembleable.java   |  30 ++++++
 .../LeaveBackgroundStatConfigEnsembleable.java  |  30 ++++++
 .../curator/framework/api/ReconfigBuilder.java  |   6 +-
 .../framework/imps/CreateBuilderImpl.java       |  14 +--
 .../framework/imps/DeleteBuilderImpl.java       | 103 +++++++++----------
 .../framework/imps/GetConfigBuilderImpl.java    |   2 +-
 .../framework/imps/ReconfigBuilderImpl.java     |  48 ++++-----
 .../framework/imps/TestReconfiguration.java     |  32 +++---
 11 files changed, 204 insertions(+), 111 deletions(-)
----------------------------------------------------------------------



Mime
View raw message