[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

[ctubbsii]

Merge branch '1.6.0-SNAPSHOT'

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


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

Branch: refs/heads/master
Commit: 4b9300fe21058cb1b02fb31430b4c5b9cab8dfad
Parents: ea18904 9cfa4b5
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Apr 16 14:07:09 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Apr 16 14:07:09 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/cli/TestClientOpts.java       | 112 +++++++++----------
 .../core/client/mock/MockNamespacesTest.java    |   3 -
 2 files changed, 55 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b9300fe/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
index 584ca6c,db4a12b..1e86f73
--- 
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
@@@ -20,8 -20,6 +20,7 @@@ package org.apache.accumulo.core.client
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
  
- import java.io.File;
 +import java.nio.charset.StandardCharsets;
  import java.util.EnumSet;
  import java.util.HashSet;
  import java.util.Map.Entry;