svn commit: r1189019 [2/2] - in /hbase/branches/0.90: ./ src/main/java/org/apache/hadoop/hbase/ src/main/java/org/apache/hadoop/hbase/catalog/ src/main/java/org/apache/hadoop/hbase/client/ src/main/java/org/apache/hadoop/hbase/client/replication/ src/m...

[te...@apache.org]

Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java?rev=1189019&r1=1189018&r2=1189019&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java Wed Oct 26 04:05:15 2011
@@ -72,7 +72,7 @@ public class TestClockSkewDetection {
 
       @Override
       public void stop(String why) {
-      }}, null, null);
+      }}, null, null, false);
 
     LOG.debug("regionServerStartup 1");
     HServerInfo hsi1 = new HServerInfo(new HServerAddress("example.org:1234"),
@@ -93,4 +93,4 @@ public class TestClockSkewDetection {
       LOG.info("Recieved expected exception: "+e);
     }
   }
-}
\ No newline at end of file
+}

Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java?rev=1189019&r1=1189018&r2=1189019&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java Wed Oct 26 04:05:15 2011
@@ -112,8 +112,7 @@ public class TestMergeTable {
       LOG.info("Starting mini hbase cluster");
       UTIL.startMiniHBaseCluster(1, 1);
       Configuration c = new Configuration(UTIL.getConfiguration());
-      HConnection connection = HConnectionManager.getConnection(c);
-      CatalogTracker ct = new CatalogTracker(connection);
+      CatalogTracker ct = new CatalogTracker(c);
       ct.start();
       List<HRegionInfo> originalTableRegions =
         MetaReader.getTableRegions(ct, desc.getName());