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/95bceae6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/95bceae6 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/95bceae6 Branch: refs/heads/CURATOR-3.0 Commit: 95bceae69f1235430179cbf71dacf93f6d3b6748 Parents: 4c92edb 33c19d6 Author: Scott Blum <[email protected]> Authored: Tue Feb 9 18:11:47 2016 -0500 Committer: Scott Blum <[email protected]> Committed: Tue Feb 9 18:11:47 2016 -0500 ---------------------------------------------------------------------- .../framework/recipes/cache/TreeCache.java | 3 ++ .../recipes/cache/BaseTestTreeCache.java | 3 +- .../framework/recipes/cache/TestTreeCache.java | 37 +++++++++----------- 3 files changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/95bceae6/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/95bceae6/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/BaseTestTreeCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/95bceae6/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java ----------------------------------------------------------------------
