Author: eclark
Date: Tue Dec 31 21:35:40 2013
New Revision: 1554572
URL: http://svn.apache.org/r1554572
Log:
HBASE-10260 Canary Doesn't pick up Configuration properly.
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java?rev=1554572&r1=1554571&r2=1554572&view=diff
==============================================================================
---
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
(original)
+++
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
Tue Dec 31 21:35:40 2013
@@ -35,6 +35,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.DoNotRetryIOException;
+import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
@@ -737,7 +738,7 @@ public final class Canary implements Too
}
public static void main(String[] args) throws Exception {
- int exitCode = ToolRunner.run(new Canary(), args);
+ int exitCode = ToolRunner.run(HBaseConfiguration.create(), new Canary(),
args);
System.exit(exitCode);
}
}