[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/af3d11c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af3d11c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af3d11c4

Branch: refs/heads/master
Commit: af3d11c439fb77b7c87234fdb639f7f8202d6eec
Parents: caddad0 7b7b468
Author: Josh Elser <els...@apache.org>
Authored: Sat Nov 1 18:41:25 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Sat Nov 1 18:41:25 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/functional/ConfigurableMacIT.java | 1 +
 .../test/java/org/apache/accumulo/test/functional/SimpleMacIT.java  | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/af3d11c4/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 f70a7a8,a4e6647..03677f4
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@@ -83,7 -83,8 +83,8 @@@ public class SimpleMacIT extends Abstra
      MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(folder, 
ROOT_PASSWORD);
      cfg.setNativeLibPaths(NativeMapIT.nativeMapLocation().getAbsolutePath());
      cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, 
Boolean.TRUE.toString());
+     cfg.setProperty(Property.GC_FILE_ARCHIVE, Boolean.TRUE.toString());
 -    configureForEnvironment(cfg, SimpleMacIT.class, 
createSharedTestDir(SimpleMacIT.class.getName() + "-ssl"));
 +    configureForEnvironment(cfg, 
createSharedTestDir(SimpleMacIT.class.getName() + "-ssl"));
      cluster = new MiniAccumuloClusterImpl(cfg);
    }