svn commit: r1181961 - /hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java

[ns...@apache.org]

Author: nspiegelberg
Date: Tue Oct 11 17:44:26 2011
New Revision: 1181961

URL: http://svn.apache.org/viewvc?rev=1181961&view=rev
Log:
Make hbase-site-custom.xml override the hbase-site.xml

Summary:
The motivation for diff is that we want to override some config change for any
specific cluster easily by just adding the config entries in the
hbase-site-custom.xml for that cluster.

So adding the hbase-site-custom.xml into HBaseConfiguration.

Also merging hbase-default.xml to hbase-site.xml because both of these files
are the default configuration.

Test Plan: Tested on my dev cluster.

Reviewers: kannan, kranganathan, mbautin, nspiegelberg, gqchen

Reviewed By: kannan

CC: , hbase@lists, liyintang, pkhemani, kannan

Differential Revision: 315123

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

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=1181961&r1=1181960&r2=1181961&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java Tue Oct 11 17:44:26 2011
@@ -60,8 +60,10 @@ public class HBaseConfiguration extends 
   }
 
   public static Configuration addHbaseResources(Configuration conf) {
+    // the sequence matters
     conf.addResource("hbase-default.xml");
     conf.addResource("hbase-site.xml");
+    conf.addResource("hbase-site-custom.xml");
     return conf;
   }