Repository: hadoop Updated Branches: refs/heads/trunk b42d09eb6 -> 46c7577b9
YARN-1580. Documentation error regarding container-allocation.expiry-interval-ms (Brahma Reddy Battula via junping_du) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46c7577b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46c7577b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46c7577b Branch: refs/heads/trunk Commit: 46c7577b9843766b8cc3e81eae1100d4c194286a Parents: b42d09e Author: Junping Du <[email protected]> Authored: Thu Feb 12 03:38:54 2015 -0800 Committer: Junping Du <[email protected]> Committed: Thu Feb 12 03:38:54 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/46c7577b/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 23923d0..3b741a1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -555,6 +555,9 @@ Release 2.7.0 - UNRELEASED YARN-3151. On Failover tracking url wrong in application cli for KILLED application (Rohith via xgong) + YARN-1580. Documentation error regarding "container-allocation.expiry-interval-ms" + (Brahma Reddy Battula via junping_du) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/46c7577b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index c79e0b0..a7958a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -588,7 +588,7 @@ <description>Interval for the roll over for the master key used to generate container tokens. It is expected to be much greater than yarn.nm.liveness-monitor.expiry-interval-ms and - yarn.rm.container-allocation.expiry-interval-ms. Otherwise the + yarn.resourcemanager.rm.container-allocation.expiry-interval-ms. Otherwise the behavior is undefined. </description> <name>yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs</name>
