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:24 UTC

[39/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/a4a23aa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/a4a23aa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/a4a23aa8

Branch: refs/heads/zk3.3.x
Commit: a4a23aa80eeb7fd17aa5ba5c1e7b19926aa1c09e
Parents: 1f66d46 8702823
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Tue Sep 4 14:02:11 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Tue Sep 4 14:02:11 2012 -0700

----------------------------------------------------------------------
 CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------