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:53 UTC
svn commit: r1373936 -
/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
Author: stack
Date: Thu Aug 16 17:31:53 2012
New Revision: 1373936
URL: http://svn.apache.org/viewvc?rev=1373936&view=rev
Log:
HBASE-6596 Revert HBASE-5022; it undoes HBC.create
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=1373936&r1=1373935&r2=1373936&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java Thu Aug 16 17:31:53 2012
@@ -116,10 +116,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;
}
/**