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