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/08/16 19:31:45 UTC

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

Author: stack
Date: Thu Aug 16 17:31:44 2012
New Revision: 1373935

URL: http://svn.apache.org/viewvc?rev=1373935&view=rev
Log:
HBASE-6596 Revert HBASE-5022; it undoes HBC.create

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=1373935&r1=1373934&r2=1373935&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 Thu Aug 16 17:31:44 2012
@@ -114,10 +114,13 @@ public class HBaseConfiguration extends 
   /**
    * Creates a clone of passed configuration.
    * @param that Configuration to clone.
-   * @return a clone of passed configuration.
+   * @return a Configuration created with the hbase-*.xml files plus
+   * the given configuration.
    */
   public static Configuration create(final Configuration that) {
-    return new Configuration(that);
+    Configuration conf = create();
+    merge(conf, that);
+    return conf;
   }
 
   /**