[GitHub] kpm1985 closed pull request #977: fixes #976 fixed scan --raw

[GitBox <gi...@apache.org>]

kpm1985 closed pull request #977: fixes #976 fixed scan --raw
URL: https://github.com/apache/fluo/pull/977
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/modules/command/src/main/java/org/apache/fluo/command/FluoScan.java b/modules/command/src/main/java/org/apache/fluo/command/FluoScan.java
index 61e05df6..4d56194d 100644
--- a/modules/command/src/main/java/org/apache/fluo/command/FluoScan.java
+++ b/modules/command/src/main/java/org/apache/fluo/command/FluoScan.java
@@ -20,6 +20,7 @@
 
 import com.beust.jcommander.Parameter;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.core.client.FluoAdminImpl;
 import org.apache.fluo.core.util.ScanUtil;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -100,6 +101,7 @@ public static void main(String[] args) {
     CommandUtil.verifyAppRunning(config);
 
     if (options.scanAccumuloTable) {
+      config = FluoAdminImpl.mergeZookeeperConfig(config);
       ScanUtil.scanAccumulo(options.getScanOpts(), config);
     } else {
       ScanUtil.scanFluo(options.getScanOpts(), config);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services