Merge branch 'master' into CURATOR-72 CURATOR-72
authorrandgalt <randgalt@apache.org>
Mon, 3 Feb 2014 18:57:36 +0000 (13:57 -0500)
committerrandgalt <randgalt@apache.org>
Mon, 3 Feb 2014 18:57:36 +0000 (13:57 -0500)
commit777a5f13ca1055849d4ffa9c3811c0e3283b2168
tree422319630763860470ad87941af10766527b59d2
parent5238d5f083f0c5b9c28e4c73d834873737dab936
parent863eaee2f11fe930601c3da3bce386263fb552c4
Merge branch 'master' into CURATOR-72
curator-client/src/main/java/org/apache/curator/ConnectionState.java