[3/3] git commit: Merge branch '1.6'

[elserj]

Merge branch '1.6'

Conflicts:
        
core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5640280d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5640280d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5640280d

Branch: refs/heads/master
Commit: 5640280d83015a14ea7eacfb9a21d3a8fddf7a08
Parents: 4bbaddc 1b35d26
Author: Josh Elser <els...@apache.org>
Authored: Fri Oct 10 15:39:08 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Fri Oct 10 15:39:08 2014 -0400

----------------------------------------------------------------------
 .../core/client/ClientConfiguration.java        |  2 ++
 .../core/client/ZooKeeperInstanceTest.java      | 22 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5640280d/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5640280d/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
index b215f4c,dde5575..98de0b5
--- 
a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
@@@ -16,9 -16,14 +16,15 @@@
   */
  package org.apache.accumulo.core.client;
  
+ import static org.easymock.EasyMock.createMock;
+ import static org.easymock.EasyMock.expect;
+ import static org.easymock.EasyMock.replay;
+ import static org.junit.Assert.assertEquals;
+ 
 +import java.nio.charset.StandardCharsets;
  import java.util.List;
  import java.util.UUID;
+ 
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
  import org.apache.accumulo.fate.zookeeper.ZooCache;