diff --git a/CHANGES.txt b/CHANGES.txt index 38f159e8146..6f6f6cab637 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -136,6 +136,8 @@ Release 0.20.0 - Unreleased HBASE-1421 Processing a regionserver message -- OPEN, CLOSE, SPLIT, etc. -- and if we're carrying more than one message in payload, if exception, all messages that follow are dropped on floor + HBASE-1434 Duplicate property in hbase-default.xml (Lars George via Andrew + Purtell) IMPROVEMENTS HBASE-1089 Add count of regions on filesystem to master UI; add percentage diff --git a/conf/hbase-default.xml b/conf/hbase-default.xml index 1d5488bf81c..2b595755b81 100644 --- a/conf/hbase-default.xml +++ b/conf/hbase-default.xml @@ -91,15 +91,6 @@ The host and port a HBase region server runs at. - - hbase.regionserver.dns.interface - default - Name of the network interface which a regionserver - should use to determine it's "real" IP address. This lookup - prevents strings like "localhost" and "127.0.0.1" from being - reported back to the master. - - hbase.regionserver.info.port 60030