[2/2] curator git commit: Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into CURATOR-331

[cammckenzie]

Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into 
CURATOR-331

Conflicts:
        
curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java


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

Branch: refs/heads/CURATOR-331
Commit: dd8170507b2edd7bb8dbbdf4bb4277749a73144f
Parents: 31a8241 7ae8c2d
Author: Cam McKenzie <cammcken...@apache.org>
Authored: Wed Jun 15 08:30:17 2016 +1000
Committer: Cam McKenzie <cammcken...@apache.org>
Committed: Wed Jun 15 08:30:17 2016 +1000

----------------------------------------------------------------------
 .../framework/recipes/cache/TreeCache.java      |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 51 ++++++++++++++++++--
 2 files changed, 48 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/dd817050/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/dd817050/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
----------------------------------------------------------------------
diff --cc 
curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index b10df68,2d0ae83..62cf586
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@@ -21,8 -21,9 +21,9 @@@ package org.apache.curator.framework.re
  
  import com.google.common.collect.ImmutableSet;
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.test.KillServerSession;
- import org.apache.curator.test.KillSession;
+ import org.apache.curator.framework.api.UnhandledErrorListener;
+ import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
 -import org.apache.curator.test.KillSession;
  import org.apache.curator.utils.CloseableUtils;
  import org.apache.zookeeper.CreateMode;
  import org.testng.Assert;