Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/107a3ff3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/107a3ff3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/107a3ff3 Branch: refs/heads/master Commit: 107a3ff3ee5dc2a3dba6583aa3d114b6f0dbb207 Parents: 5d2f93a c515333 Author: Josh Elser <els...@apache.org> Authored: Mon Jan 19 16:06:47 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 19 16:06:47 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/ZooKeeperInstance.java | 4 ++++ .../accumulo/core/client/ZooKeeperInstanceTest.java | 14 +++++++++++--- .../mapreduce/lib/impl/ConfiguratorBaseTest.java | 12 +++++++----- .../apache/accumulo/test/functional/ReadWriteIT.java | 7 +++++++ 4 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/107a3ff3/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/107a3ff3/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/107a3ff3/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ----------------------------------------------------------------------
