[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

[busbey]

Merge branch '1.6.1-SNAPSHOT'

Conflicts:
        
core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java


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

Branch: refs/heads/master
Commit: dbb9cc4a229754382e3f977b591f4035df96accc
Parents: ef78dc4 985a699
Author: Sean Busbey <bus...@cloudera.com>
Authored: Mon Jun 30 09:48:54 2014 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Mon Jun 30 09:48:54 2014 -0500

----------------------------------------------------------------------
 .../ShardedTableDistributionFormatterTest.java  | 30 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbb9cc4a/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
index c4a7107,8fc68fd..8f46c89
--- 
a/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
@@@ -19,12 -19,16 +19,16 @@@ package org.apache.accumulo.core.util.f
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  
 +import java.nio.charset.StandardCharsets;
+ import java.util.Arrays;
+ import java.util.List;
  import java.util.Map;
  import java.util.TreeMap;
  
 -import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.data.Key;
  import org.apache.accumulo.core.data.Value;
+ import org.apache.commons.collections.CollectionUtils;
+ import org.apache.commons.collections.Predicate;
  import org.junit.Before;
  import org.junit.Test;