curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [12/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
Date Mon, 10 Jun 2013 15:00:57 GMT
Merge branch 'master' into zk3.3.x

Conflicts:
	build.gradle


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

Branch: refs/heads/zk3.3.x
Commit: c5744fb6f4ff301156ae5cca650ff0b7e861b1fc
Parents: dd59770 07efadb
Author: Jordan Zimmerman <jordan@jordanzimmerman.com>
Authored: Mon Aug 6 12:57:49 2012 -0700
Committer: Jordan Zimmerman <jordan@jordanzimmerman.com>
Committed: Mon Aug 6 12:57:49 2012 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  7 +++
 .../framework/imps/CuratorFrameworkImpl.java    |  3 +-
 .../framework/imps/TestNamespaceFacade.java     |  3 ++
 .../discovery/details/ServiceDiscoveryImpl.java | 22 +++++++++
 .../x/discovery/TestServiceDiscovery.java       | 50 ++++++++++++++++++++
 5 files changed, 84 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/c5744fb6/curator-framework/src/main/java/com/netflix/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------


Mime
View raw message