ACCUMULO-2722 Remove throws Exception which isn't actually thrown.

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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 50baaf172d0e827034b7297cc2de88996b05ea1d
Parents: 9199759
Author: Josh Elser <els...@apache.org>
Authored: Thu Jun 26 14:21:03 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Jun 26 14:21:03 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/50baaf17/core/src/main/java/org/apache/accumulo/core/util/Merge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java 
b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index b6cb07f..ca71afd 100644
--- 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,7 +32,6 @@ import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.data.Value;
-import org.apache.commons.cli.ParseException;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
@@ -79,7 +78,7 @@ 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);
     
@@ -102,7 +101,7 @@ public class Merge {
     }
   }
   
-  public static void main(String[] args) throws MergeException, ParseException 
{
+  public static void main(String[] args) throws MergeException {
     Merge merge = new Merge();
     merge.start(args);
   }

Reply via email to