[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

[elserj]

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
        core/src/main/java/org/apache/accumulo/core/util/Merge.java


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 9348032fe84c280b90bc9ddf37e16337090999ac
Parents: f506e2c 50baaf1
Author: Josh Elser <els...@apache.org>
Authored: Thu Jun 26 14:28:53 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Jun 26 14:28:53 2014 -0400

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/util/Merge.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9348032f/core/src/main/java/org/apache/accumulo/core/util/Merge.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/Merge.java
index f268160,ca71afd..02c8be3
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@@ -32,11 -32,6 +32,10 @@@ import org.apache.accumulo.core.conf.Pr
  import org.apache.accumulo.core.data.Key;
  import org.apache.accumulo.core.data.KeyExtent;
  import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
 +import org.apache.accumulo.core.security.Authorizations;
- import org.apache.commons.cli.ParseException;
  import org.apache.hadoop.io.Text;
  import org.apache.log4j.Logger;
  
@@@ -84,9 -78,9 +83,9 @@@ public class Merge 
      Text end = null;
    }
    
-   public void start(String[] args) throws MergeException, ParseException {
+   public void start(String[] args) throws MergeException {
      Opts opts = new Opts();
 -    opts.parseArgs(Merge.class.getCanonicalName(), args);
 +    opts.parseArgs(Merge.class.getName(), args);
      
      try {
        Connector conn = opts.getConnector();