Merge remote-tracking branch 'temp/CURATOR-33' into CURATOR-33 Conflicts: curator-client/src/test/java/org/apache/curator/utils/TestZKPaths.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/fd5c8aa1 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/fd5c8aa1 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/fd5c8aa1 Branch: refs/heads/CURATOR-33 Commit: fd5c8aa1dcdc60b88f3f229aaba36304a4d90b9a Parents: dcb44a1 eb1bae5 Author: randgalt <randg...@apache.org> Authored: Thu Jul 31 10:03:10 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Thu Jul 31 10:03:10 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/curator/utils/ZKPaths.java | 16 + .../framework/recipes/cache/TreeCache.java | 605 +++++++++++++++++++ .../framework/recipes/cache/TreeCacheEvent.java | 126 ++++ .../recipes/cache/TreeCacheListener.java | 37 ++ .../framework/recipes/cache/TestTreeCache.java | 420 +++++++++++++ 5 files changed, 1204 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/fd5c8aa1/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java ---------------------------------------------------------------------- diff --cc curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java index 820f45f,1e17217..352bfd6 --- a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java +++ b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java @@@ -16,9 -16,9 +16,10 @@@ * specific language governing permissions and limitations * under the License. */ + package org.apache.curator.utils; + import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException;