curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [23/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
Date Mon, 10 Jun 2013 15:01:08 GMT
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/f8751cdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/f8751cdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/f8751cdd

Branch: refs/heads/zk3.3.x
Commit: f8751cdd29e1715a8d43186da70b102dd24a4424
Parents: 534604b f1b94a6
Author: Jordan Zimmerman <jordan@jordanzimmerman.com>
Authored: Mon Sep 3 17:46:14 2012 -0700
Committer: Jordan Zimmerman <jordan@jordanzimmerman.com>
Committed: Mon Sep 3 17:46:14 2012 -0700

----------------------------------------------------------------------
 gradle/buildscript.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



Mime
View raw message