curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dragonsi...@apache.org
Subject [26/31] curator git commit: Merge branch 'CURATOR-161' into CURATOR-217
Date Tue, 18 Aug 2015 23:18:42 GMT
Merge branch 'CURATOR-161' into CURATOR-217

Conflicts:
	curator-framework/src/main/java/org/apache/curator/framework/api/BackgroundPathableQuietly.java


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

Branch: refs/heads/CURATOR-3.0
Commit: eba6ce8f9ae772d0a30ced495b1b9130dec0ad40
Parents: ff2ed84 6612c91
Author: randgalt <randgalt@apache.org>
Authored: Tue May 19 19:42:23 2015 -0700
Committer: randgalt <randgalt@apache.org>
Committed: Tue May 19 19:42:23 2015 -0700

----------------------------------------------------------------------
 .../api/BackgroundPathableQuietlyable.java      |  5 +++
 .../curator/framework/api/DeleteBuilder.java    |  2 +-
 .../curator/framework/api/Guaranteeable.java    |  2 +-
 .../framework/api/GuaranteeableDeletable.java   | 39 ++++++++++++++++++++
 .../framework/api/GuaranteeableDelete.java      | 39 --------------------
 .../framework/api/RemoveWatchesLocal.java       |  4 +-
 .../framework/api/RemoveWatchesType.java        |  2 +-
 .../framework/imps/FailedOperationManager.java  |  3 ++
 .../imps/FailedRemoveWatchManager.java          |  2 +-
 .../framework/imps/NamespaceWatcherMap.java     |  8 ----
 .../imps/RemoveWatchesBuilderImpl.java          |  4 +-
 11 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/eba6ce8f/curator-framework/src/main/java/org/apache/curator/framework/api/RemoveWatchesLocal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/eba6ce8f/curator-framework/src/main/java/org/apache/curator/framework/api/RemoveWatchesType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/eba6ce8f/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
----------------------------------------------------------------------


Mime
View raw message