Merge branch 'CURATOR-3.0' into CURATOR-290
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d26c38db Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d26c38db Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d26c38db Branch: refs/heads/CURATOR-3.0 Commit: d26c38dbaf545505b70ab3e841f2b962cc409b45 Parents: adb4be4 75325d4 Author: randgalt <[email protected]> Authored: Mon Jan 18 18:12:18 2016 -0500 Committer: randgalt <[email protected]> Committed: Mon Jan 18 18:12:18 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/curator/utils/ZKPaths.java | 2 +- .../framework/recipes/locks/TestLockACLs.java | 50 ++++++++++++++++---- 2 files changed, 43 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
