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:05 UTC
[20/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
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/1098bd63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/1098bd63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/1098bd63
Branch: refs/heads/zk3.3.x
Commit: 1098bd63146a9bc0a0b8f0fc4c08bb92e4fcbf4d
Parents: c2117ea 317323c
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Mon Sep 3 17:39:38 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Mon Sep 3 17:39:38 2012 -0700
----------------------------------------------------------------------
build.gradle | 2 --
gradle.properties | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1098bd63/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1098bd63/gradle.properties
----------------------------------------------------------------------
diff --cc gradle.properties
index 6b59bf6,c96dc19..efe92c1
--- a/gradle.properties
+++ b/gradle.properties
@@@ -1,1 -1,1 +1,1 @@@
- version=1.4-SNAPSHOT
-version=1.1.18
++version=1.0.19