diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 0839a1486f..8bc35a5616 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -151,6 +151,9 @@ Branch-2 ( Unreleased changes ) MAPREDUCE-4407. Add hadoop-yarn-server-tests--tests.jar to hadoop dist package. (ahmed via tucu) + MAPREDUCE-4465. Update description of yarn.nodemanager.address property. + (bowang via tucu) + Release 2.1.0-alpha - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index ba570c3e5d..8aaaf38d4d 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -241,7 +241,7 @@ - address of node manager IPC. + The address of the container manager in the NM. yarn.nodemanager.address 0.0.0.0:0