Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d6ca1b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d6ca1b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d6ca1b Branch: refs/heads/master Commit: 18d6ca1bf79793443366c04e54285214a69eb422 Parents: c202598 affb974 Author: Mike Drob <md...@cloudera.com> Authored: Thu Jun 5 15:12:08 2014 -0700 Committer: Mike Drob <md...@cloudera.com> Committed: Thu Jun 5 15:12:08 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d6ca1b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ----------------------------------------------------------------------
