HDFS-2570. svn merge -c 1204129 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204130 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -25,6 +25,9 @@ Release 0.23.1 - UNRELEASED
     HDFS-2454. Move maxXceiverCount check to before starting the
     thread in dataXceiver. (harsh via eli)
 
+    HDFS-2570. Add descriptions for dfs.*.https.address in hdfs-default.xml.
+    (eli)
+
   OPTIMIZATIONS
 
     HDFS-2130. Switch default checksum to CRC32C. (todd)

hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml

@@ -122,11 +122,17 @@ creations/deletions), or "all".</description>
 <property>
   <name>dfs.datanode.https.address</name>
   <value>0.0.0.0:50475</value>
+  <description>The datanode secure http server address and port.
+    If the port is 0 then the server will start on a free port.
+  </description>
 </property>
 
 <property>
   <name>dfs.namenode.https-address</name>
   <value>0.0.0.0:50470</value>
+  <description>The namenode secure http server address and port.
+    If the port is 0 then the server will start on a free port.
+  </description>
 </property>
 
  <property>