Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (revision 1511585) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (working copy) @@ -66,7 +66,7 @@ */ @Test (timeout=300000) public void testMergeTable() throws Exception { // Table we are manually creating offline. - HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(Bytes.toBytes("test"))); + HTableDescriptor desc = new HTableDescriptor(org.apache.hadoop.hbase.TableName.valueOf(Bytes.toBytes("test"))); desc.addFamily(new HColumnDescriptor(COLUMN_NAME)); // Set maximum regionsize down. Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (revision 1511585) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (working copy) @@ -67,7 +67,7 @@ this.conf.set("hbase.hstore.compactionThreshold", "2"); // Create table description - this.desc = new HTableDescriptor(TableName.valueOf("TestMergeTool")); + this.desc = new HTableDescriptor(org.apache.hadoop.hbase.TableName.valueOf("TestMergeTool")); this.desc.addFamily(new HColumnDescriptor(FAMILY)); /* @@ -268,9 +268,9 @@ + System.currentTimeMillis(); LOG.info("Creating log " + logPath.toString() + "/" + logName); - HLog log = HLogFactory.createHLog(this.fs, logPath, + HLog log = HLogFactory.createHLog(this.fs, logPath, logName, this.conf); - + try { // Merge Region 0 and Region 1 HRegion merged = mergeAndVerify("merging regions 0 and 1 ",