Index: hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (revision 1373934) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (working copy) @@ -116,10 +116,13 @@ /** * 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; } /**