Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 92CE011EE4 for ; Thu, 26 Jun 2014 19:08:23 +0000 (UTC) Received: (qmail 87734 invoked by uid 500); 26 Jun 2014 19:08:23 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87687 invoked by uid 500); 26 Jun 2014 19:08:23 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 87669 invoked by uid 99); 26 Jun 2014 19:08:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jun 2014 19:08:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 335FB8A0DFA; Thu, 26 Jun 2014 19:08:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 26 Jun 2014 19:08:23 -0000 Message-Id: <8a0bbdd45539430e98290e247d389aec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: ACCUMULO-2722 Remove throws Exception which isn't actually thrown. Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 919975904 -> 50baaf172 refs/heads/1.6.1-SNAPSHOT f506e2c73 -> 9348032fe refs/heads/master f9a0d42ad -> a4fce6f50 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.5.2-SNAPSHOT Commit: 50baaf172d0e827034b7297cc2de88996b05ea1d Parents: 9199759 Author: Josh Elser Authored: Thu Jun 26 14:21:03 2014 -0400 Committer: Josh Elser 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); }