HBASE-3089 REST tests are broken locally and up in hudson; some minor changes that should have been included on last commit

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1006065 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java

@@ -120,7 +120,6 @@ class CatalogJanitor extends Chore {
    * @return Null if not found (and logs fact that expected COL_REGIONINFO
    * was missing) else deserialized {@link HRegionInfo}
    * @throws IOException
-   * @throws NullPointerException if null cell
    */
   static HRegionInfo getHRegionInfo(final Result result)
   throws IOException {

src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java

@@ -46,6 +46,8 @@ public class TestScannerTimeout {
   private final static byte[] SOME_BYTES = Bytes.toBytes("f");
   private final static byte[] TABLE_NAME = Bytes.toBytes("t");
   private final static int NB_ROWS = 10;
+  // Be careful w/ what you set this timer too... it can get in the way of
+  // the mini cluster coming up -- the verification in particular.
   private final static int SCANNER_TIMEOUT = 10000;
 
    /**

src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java

@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.util;
 
 import java.io.IOException;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.AbstractMergeTestBase;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.HMerge;
@@ -36,8 +37,9 @@ public class TestMergeTable extends AbstractMergeTestBase {
    */
   public void testMergeTable() throws IOException {
     assertNotNull(dfsCluster);
-    HBaseAdmin admin = new HBaseAdmin(conf);
+    Configuration c = new Configuration(this.conf);
+    HBaseAdmin admin = new HBaseAdmin(c);
     admin.disableTable(desc.getName());
-    HMerge.merge(conf, dfsCluster.getFileSystem(), desc.getName());
+    HMerge.merge(c, dfsCluster.getFileSystem(), desc.getName());
   }
 }