Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1461235) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -1,5 +1,3 @@ - - /** * * Licensed to the Apache Software Foundation (ASF) under one @@ -38,8 +36,10 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.NavigableSet; import java.util.Random; import java.util.Set; @@ -1656,6 +1656,7 @@ if (jobConf == null) { jobConf = mrCluster.createJobConf(); } + HBaseConfiguration.merge(this.conf, jobConf); jobConf.set("mapred.local.dir", conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not LOG.info("Mini mapreduce cluster started"); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java (revision 1461235) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java (working copy) @@ -228,8 +228,11 @@ OUTPUT_DIR }; - GenericOptionsParser opts = new GenericOptionsParser(new Configuration(cluster.getConfiguration()), args); + GenericOptionsParser opts = new GenericOptionsParser(new Configuration( + cluster.getConfiguration()), args); Configuration conf = opts.getConfiguration(); + // copy or add the necessary configuration values from the map reduce config to the hbase config + copyConfigurationValues(UTIL.getConfiguration(), conf); args = opts.getRemainingArgs(); assertEquals(conf.get(Export.EXPORT_BATCHING), EXPORT_BATCH_SIZE); @@ -350,6 +353,8 @@ GenericOptionsParser opts = new GenericOptionsParser(new Configuration( cluster.getConfiguration()), args); Configuration conf = opts.getConfiguration(); + // copy or add the necessary configuration values from the map reduce config to the hbase config + copyConfigurationValues(UTIL.getConfiguration(), conf); args = opts.getRemainingArgs(); Job job = Export.createSubmittableJob(conf, args); @@ -369,6 +374,8 @@ opts = new GenericOptionsParser(new Configuration(cluster.getConfiguration()), args); conf = opts.getConfiguration(); + // copy or add the necessary configuration values from the map reduce config to the hbase config + copyConfigurationValues(UTIL.getConfiguration(), conf); args = opts.getRemainingArgs(); job = Import.createSubmittableJob(conf, args); @@ -392,6 +399,8 @@ opts = new GenericOptionsParser(new Configuration(cluster.getConfiguration()), args); conf = opts.getConfiguration(); + // copy or add the necessary configuration values from the map reduce config to the hbase config + copyConfigurationValues(UTIL.getConfiguration(), conf); args = opts.getRemainingArgs(); job = Import.createSubmittableJob(conf, args); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (revision 1461235) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (working copy) @@ -484,7 +484,7 @@ this.rsAccounting = this.rsServices.getRegionServerAccounting(); // don't initialize coprocessors if not running within a regionserver // TODO: revisit if coprocessors should load in other cases - this.coprocessorHost = new RegionCoprocessorHost(this, rsServices, conf); + this.coprocessorHost = new RegionCoprocessorHost(this, rsServices, baseConf); this.metricsRegionWrapper = new MetricsRegionWrapperImpl(this); this.metricsRegion = new MetricsRegion(this.metricsRegionWrapper); } else { Index: pom.xml =================================================================== --- pom.xml (revision 1461235) +++ pom.xml (working copy) @@ -880,7 +880,7 @@ 1.6 ${project.version} - 2.0.2-alpha + 2.0.4-SNAPSHOT 1.1.2 1.2 1.7