Merge branch 'CURATOR-190'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/da8b2d42 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da8b2d42 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/da8b2d42 Branch: refs/heads/CURATOR-160 Commit: da8b2d4232c3d50d109aa7dbcb47a64c338e599d Parents: 11d1dd4 017e199 Author: Cameron McKenzie <came...@unico.com.au> Authored: Tue Apr 28 11:01:18 2015 +1000 Committer: Cameron McKenzie <came...@unico.com.au> Committed: Tue Apr 28 11:01:18 2015 +1000 ---------------------------------------------------------------------- .../framework/client/TestBackgroundStates.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ----------------------------------------------------------------------