curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [14/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x 1.0.18
Date Mon, 10 Jun 2013 15:00:59 GMT
Merge branch 'master' into zk3.3.x
1.0.18

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

Branch: refs/heads/zk3.3.x
Commit: 2a1ec77945a0109193a1f4b435041c97a13e180c
Parents: c5744fb 7a893f6
Author: Jordan Zimmerman <jordan@jordanzimmerman.com>
Authored: Thu Aug 30 16:30:33 2012 -0500
Committer: Jordan Zimmerman <jordan@jordanzimmerman.com>
Committed: Thu Aug 30 16:30:33 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   9 +-
 build.gradle                                    |   2 +-
 .../exhibitor/ExhibitorEnsembleProvider.java    |   2 +-
 .../recipes/cache/PathChildrenCache.java        |   2 +-
 .../recipes/cache/TestPathChildrenCache.java    |  45 ++++++
 .../locks/TestInterProcessSemaphoreCluster.java | 140 +++++++++++++++++++
 6 files changed, 195 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2a1ec779/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index 401b221,2a40a8c..4070d6c
--- a/build.gradle
+++ b/build.gradle
@@@ -1,6 -1,6 +1,6 @@@
  // Establish version and status
  def performingRelease = project.hasProperty('release') && Boolean.parseBoolean(project.release)
- def releaseVersion = '1.0.17'
 -def releaseVersion = '1.1.17'
++def releaseVersion = '1.0.18'
  def versionPostfix = performingRelease?'':'-SNAPSHOT'
  version = "${releaseVersion}${versionPostfix}"
  status = performingRelease?'release':'snapshot'


Mime
View raw message