Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4C9D9200C25 for ; Thu, 9 Feb 2017 14:38:14 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4B679160B50; Thu, 9 Feb 2017 13:38:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 92FC1160B64 for ; Thu, 9 Feb 2017 14:38:13 +0100 (CET) Received: (qmail 71657 invoked by uid 500); 9 Feb 2017 13:38:12 -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 71508 invoked by uid 99); 9 Feb 2017 13:38:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Feb 2017 13:38:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97DE0DFE1D; Thu, 9 Feb 2017 13:38:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mmiller@apache.org To: commits@accumulo.apache.org Date: Thu, 09 Feb 2017 13:38:14 -0000 Message-Id: <5fd898e0d2b94b74988c25d6a89e6551@git.apache.org> In-Reply-To: <3c879c69de5e490b80eafd86106aed09@git.apache.org> References: <3c879c69de5e490b80eafd86106aed09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: ACCUMULO-4577: Fix merge error archived-at: Thu, 09 Feb 2017 13:38:14 -0000 ACCUMULO-4577: Fix merge error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4120422 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4120422 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4120422 Branch: refs/heads/1.8 Commit: f4120422bcaf8466c5c49054761c4bc10f8fba68 Parents: a0b2dc8 Author: Mike Miller Authored: Wed Feb 8 14:36:26 2017 -0500 Committer: Mike Miller Committed: Wed Feb 8 14:36:26 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/core/client/impl/Tables.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4120422/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java index cbf9671..fcf838f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java @@ -272,7 +272,7 @@ public class Tables { * @throws IllegalArgumentException * if the table doesn't exist in ZooKeeper */ - public static String getNamespaceId(Instance instance, String tableId) throws IllegalArgumentException { + public static String getNamespaceId(Instance instance, String tableId) throws TableNotFoundException { checkArgument(instance != null, "instance is null"); checkArgument(tableId != null, "tableId is null");