HBASE-6596 Revert HBASE-5022; it undoes HBC.create
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1373936 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
14d07f96e1
commit
ea61bc702b
|
@ -116,10 +116,13 @@ public class HBaseConfiguration extends Configuration {
|
|||
/**
|
||||
* 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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue