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 DD7A9D20E for ; Fri, 17 May 2013 19:26:27 +0000 (UTC) Received: (qmail 58322 invoked by uid 500); 17 May 2013 19:26:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58297 invoked by uid 500); 17 May 2013 19:26:28 -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 58290 invoked by uid 99); 17 May 2013 19:26:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 19:26:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 19:26:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AB67D23888E7; Fri, 17 May 2013 19:26:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483956 - in /accumulo/branches/1.5: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/util/shell/commands/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ s... Date: Fri, 17 May 2013 19:26:06 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130517192606.AB67D23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Fri May 17 19:26:05 2013 New Revision: 1483956 URL: http://svn.apache.org/r1483956 Log: ACCUMULO-1429 use the specified tablename Modified: accumulo/branches/1.5/ (props changed) accumulo/branches/1.5/assemble/ (props changed) accumulo/branches/1.5/core/ (props changed) accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java accumulo/branches/1.5/examples/ (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/1.5/proxy/README (props changed) accumulo/branches/1.5/server/ (props changed) accumulo/branches/1.5/src/ (props changed) Propchange: accumulo/branches/1.5/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1483954 Merged /accumulo/branches/1.4:r1483954 Propchange: accumulo/branches/1.5/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/assemble:r1483954 Merged /accumulo/branches/1.4/assemble:r1483954 Propchange: accumulo/branches/1.5/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/core:r1483954 Merged /accumulo/branches/1.4/src/core:r1483954 Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java?rev=1483956&r1=1483955&r2=1483956&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java Fri May 17 19:26:05 2013 @@ -129,7 +129,7 @@ public class ScanCommand extends Command throw new IllegalArgumentException("Profile " + profile + " does not exist"); } } else { - tableScanIterators = shellState.scanIteratorOptions.get(shellState.getTableName()); + tableScanIterators = shellState.scanIteratorOptions.get(tableName); if (tableScanIterators == null) { Shell.log.debug("Found no scan iterators to set"); return; Propchange: accumulo/branches/1.5/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/examples:r1483954 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1483954 Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1483954 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1483954 Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1483954 Propchange: accumulo/branches/1.5/proxy/README ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/proxy/README:r1483954 Merged /accumulo/branches/1.4/src/proxy/README:r1483954 Propchange: accumulo/branches/1.5/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/server:r1483954 Merged /accumulo/branches/1.4/src/server:r1483954 Propchange: accumulo/branches/1.5/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1483954 Merged /accumulo/branches/1.4/src/src:r1483954