diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 1147ef0f21..51dd15a6ab 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -434,6 +434,10 @@ Release 2.4.0 - UNRELEASED (Haohui Mai via brandonli) HDFS-5904. TestFileStatus fails intermittently. (Mit Desai via kihwal) + + HDFS-5941. add dfs.namenode.secondary.https-address and + dfs.namenode.secondary.https-address in hdfs-default.xml. + (Haohui Mai via cnauroth) Release 2.3.1 - UNRELEASED diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 45f2b3f288..9c3b94fcf8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -96,6 +96,14 @@ + + dfs.namenode.secondary.https-address + 0.0.0.0:50091 + + The secondary namenode HTTPS server address and port. + + + dfs.datanode.address 0.0.0.0:50010 @@ -1310,7 +1318,16 @@ dfs.journalnode.http-address 0.0.0.0:8480 - The address and port the JournalNode web UI listens on. + The address and port the JournalNode HTTP server listens on. + If the port is 0 then the server will start on a free port. + + + + + dfs.journalnode.https-address + 0.0.0.0:8481 + + The address and port the JournalNode HTTPS server listens on. If the port is 0 then the server will start on a free port.