accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1483962 - in /accumulo/trunk: ./ 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/ server/ ...
Date Fri, 17 May 2013 19:40:13 GMT
Author: ecn
Date: Fri May 17 19:40:13 2013
New Revision: 1483962

URL: http://svn.apache.org/r1483962
Log:
ACCUMULO-1429 use the specified tablename 

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/proxy/README   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1483954
  Merged /accumulo/branches/1.5:r1483956
  Merged /accumulo/branches/1.4:r1483954

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1483954
  Merged /accumulo/branches/1.4/assemble:r1483954
  Merged /accumulo/branches/1.5/assemble:r1483956

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1483956
  Merged /accumulo/branches/1.4/core:r1483954
  Merged /accumulo/branches/1.4/src/core:r1483954

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java?rev=1483962&r1=1483961&r2=1483962&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
Fri May 17 19:40:13 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/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/examples:r1483954
  Merged /accumulo/branches/1.5/examples:r1483956

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1483956
  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/trunk/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.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1483956
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1483954

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1483956

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/proxy/README:r1483954
  Merged /accumulo/branches/1.4/src/proxy/README:r1483954
  Merged /accumulo/branches/1.5/proxy/README:r1483956

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1483954
  Merged /accumulo/branches/1.5/server:r1483956
  Merged /accumulo/branches/1.4/src/server:r1483954

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1483954
  Merged /accumulo/branches/1.4/src/src:r1483954
  Merged /accumulo/branches/1.5/src:r1483956



Mime
View raw message