accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [3/4] accumulo git commit: ACCUMULO-4577: Fix merge error
Date Thu, 09 Feb 2017 14:41:20 GMT
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/master
Commit: f4120422bcaf8466c5c49054761c4bc10f8fba68
Parents: a0b2dc8
Author: Mike Miller <mmiller@apache.org>
Authored: Wed Feb 8 14:36:26 2017 -0500
Committer: Mike Miller <mmiller@apache.org>
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");
 


Mime
View raw message