Author: stack
Date: Tue Apr 3 14:57:18 2012
New Revision: 1308964
URL: http://svn.apache.org/viewvc?rev=1308964&view=rev
Log:
HBASE-5704 HBASE-4398 mistakenly rolled back on trunk
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java?rev=1308964&r1=1308963&r2=1308964&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
Tue Apr 3 14:57:18 2012
@@ -120,9 +120,8 @@ implements Configurable {
*/
@Override
public void setConf(Configuration configuration) {
- this.conf = configuration; //HBaseConfiguration.create(configuration);
+ this.conf = HBaseConfiguration.create(configuration);
try {
- HBaseConfiguration.addHbaseResources(conf);
this.table = new HTable(this.conf,
configuration.get(TableOutputFormat.OUTPUT_TABLE));
} catch (IOException e) {
