You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by st...@apache.org on 2012/05/19 07:20:34 UTC

svn commit: r1340345 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java

Author: stack
Date: Sat May 19 05:20:33 2012
New Revision: 1340345

URL: http://svn.apache.org/viewvc?rev=1340345&view=rev
Log:
HBASE-6056 Restore hbase-default version check

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=1340345&r1=1340344&r2=1340345&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java Sat May 19 05:20:33 2012
@@ -61,7 +61,6 @@ public class HBaseConfiguration extends 
   }
 
   private static void checkDefaultsVersion(Configuration conf) {
-    if (true) return; // REMOVE
     if (conf.getBoolean("hbase.defaults.for.version.skip", Boolean.FALSE)) return;
     String defaultsVersion = conf.get("hbase.defaults.for.version");
     String thisVersion = VersionInfo.getVersion();