You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2013/06/10 17:00:51 UTC

[06/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x

Merge branch 'master' into zk3.3.x


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

Branch: refs/heads/zk3.3.x
Commit: 35869a79b1a64dd3e53828b1934cfdcb9ff1a315
Parents: ed6f52f 575cc37
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Thu Aug 2 14:29:55 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Thu Aug 2 14:29:55 2012 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  8 +++++--
 build.gradle                                    |  2 +-
 .../curator/framework/CuratorFramework.java     |  6 +++++
 .../framework/imps/CuratorFrameworkImpl.java    |  6 +++++
 .../curator/framework/imps/NamespaceFacade.java |  6 +++++
 .../curator/framework/imps/NamespaceImpl.java   |  5 +++++
 .../framework/imps/TestNamespaceFacade.java     | 23 +++++++++++++++++++-
 .../barriers/DistributedDoubleBarrier.java      |  9 +++++++-
 8 files changed, 60 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/35869a79/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/35869a79/curator-framework/src/main/java/com/netflix/curator/framework/CuratorFramework.java
----------------------------------------------------------------------

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