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:01:27 UTC
[42/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
Merge branch 'master' into zk3.3.x
Conflicts:
gradle.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/f00dd30b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/f00dd30b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/f00dd30b
Branch: refs/heads/zk3.3.x
Commit: f00dd30b9b41c722fad5249da8f99b382bdd47b9
Parents: e9319d3 cbb0a63
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Tue Sep 4 23:27:04 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Tue Sep 4 23:27:04 2012 -0700
----------------------------------------------------------------------
CHANGES.txt | 6 ++++
.../x/zkclientbridge/CuratorZKClientBridge.java | 32 ++++++++++++++++++--
.../org/I0Itec/zkclient/ServerZkClientTest.java | 2 +-
3 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------