From 3172576c18f03098dbfb0ab7690e404197f7e704 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Sat, 19 May 2012 05:17:56 +0000
Subject: [PATCH] HBASE-6056 Restore hbase-default version check

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1340344 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 862d1345cbd..19cca3c72a7 100644
--- a/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -65,7 +65,6 @@ public class HBaseConfiguration extends Configuration {
   }
 
   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();