Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a0c2be08 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a0c2be08 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a0c2be08 Branch: refs/heads/master Commit: a0c2be084d13ab2dc0f2fc49872a9d7251a7a0b0 Parents: 51085be 4aa48e1 Author: Bill Slacum <ujustgotbi...@apache.org> Authored: Fri Dec 27 12:30:08 2013 -0500 Committer: Bill Slacum <ujustgotbi...@apache.org> Committed: Fri Dec 27 12:30:08 2013 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/ZooKeeperInstance.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
