Merge remote-tracking branch 'temp/CURATOR-6' into CURATOR-6
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b3100765 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3100765 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b3100765 Branch: refs/heads/master Commit: b310076585f268693af485bc1a9d3a7d08719951 Parents: 10bd72c aacdda3 Author: randgalt <randg...@apache.org> Authored: Wed Jul 30 15:03:06 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed Jul 30 15:03:06 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/curator/framework/state/ConnectionState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
