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/f9af0ce8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f9af0ce8 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f9af0ce8 Branch: refs/heads/CURATOR-3.0 Commit: f9af0ce81408f7a4cb4343fb0770e9e6ef545fda Parents: 2fc9e37 061ed0a Author: Mike Drob <md...@apache.org> Authored: Mon Aug 24 07:10:20 2015 -0500 Committer: Mike Drob <md...@apache.org> Committed: Mon Aug 24 07:10:20 2015 -0500 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 26 +++++++++----------- .../framework/imps/TestBlockUntilConnected.java | 24 ++++++++++++++++++ 2 files changed, 36 insertions(+), 14 deletions(-) ----------------------------------------------------------------------