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:00:52 UTC

[07/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x

Merge branch 'master' into zk3.3.x


Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/5685b1c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/5685b1c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/5685b1c6

Branch: refs/heads/zk3.3.x
Commit: 5685b1c6d1913e887fab3ecb960fa266d2de61d1
Parents: 35869a7 d0d0337
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Thu Aug 2 15:01:19 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Thu Aug 2 15:01:19 2012 -0700

----------------------------------------------------------------------
 .../framework/recipes/locks/SemaphoreClient.java       |  6 ++++--
 .../locks/TestInterProcessSemaphoreCluster.java        | 13 +++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------