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

[elserj]

Merge branch '1.6'

Conflicts:
        test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java


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

Branch: refs/heads/master
Commit: a21d2d3cf252671fa4b6be6a85e7bf42ea5c829c
Parents: 1f9630d 0348e3e
Author: Josh Elser <els...@apache.org>
Authored: Tue Oct 14 21:02:36 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Tue Oct 14 21:02:36 2014 -0400

----------------------------------------------------------------------
 .../impl/MiniAccumuloClusterImpl.java           | 13 +++---
 .../impl/ZooKeeperBindException.java            | 41 ++++++++++++++++++
 .../test/functional/ConfigurableMacIT.java      | 23 ++++++++--
 .../accumulo/test/functional/SimpleMacIT.java   | 44 ++++++++++++++------
 4 files changed, 100 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a21d2d3c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a21d2d3c/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a21d2d3c/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
----------------------------------------------------------------------
diff --cc 
test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
index 01f77d0,1dd9562..f70a7a8
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@@ -67,6 -78,15 +78,15 @@@ public class SimpleMacIT extends Abstra
      }
    }
  
+   private static void createMiniAccumulo() throws Exception {
+     folder = createSharedTestDir(SimpleMacIT.class.getName());
+     MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(folder, 
ROOT_PASSWORD);
+     cfg.setNativeLibPaths(NativeMapIT.nativeMapLocation().getAbsolutePath());
+     cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, 
Boolean.TRUE.toString());
 -    configureForEnvironment(cfg, SimpleMacIT.class, 
createSharedTestDir(SimpleMacIT.class.getName() + "-ssl"));
++    configureForEnvironment(cfg, 
createSharedTestDir(SimpleMacIT.class.getName() + "-ssl"));
+     cluster = new MiniAccumuloClusterImpl(cfg);
+   }
+ 
    @Before
    public void logTestInfo() {
      if (cluster != null)