phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject [11/49] phoenix git commit: PHOENIX-1980 CsvBulkLoad cannot load hbase-site.xml from classpath
Date Wed, 24 Jun 2015 20:24:07 GMT
PHOENIX-1980 CsvBulkLoad cannot load hbase-site.xml from classpath


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6fc53b57
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6fc53b57
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6fc53b57

Branch: refs/heads/json
Commit: 6fc53b5792ea7bdd1b486860606966e76f2e5e3f
Parents: 23f5acf
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Mon May 18 10:33:42 2015 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Mon May 18 10:33:42 2015 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6fc53b57/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
index 31f8b42..a5a8aa1 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java
@@ -176,7 +176,7 @@ public class CsvBulkLoadTool extends Configured implements Tool {
     @Override
     public int run(String[] args) throws Exception {
 
-        Configuration conf = HBaseConfiguration.addHbaseResources(getConf());
+        Configuration conf = HBaseConfiguration.create(getConf());
 
         CommandLine cmdLine = null;
         try {


Mime
View raw message