From 634cc297baf7ba661a0e8be87488f9aafc4460a3 Mon Sep 17 00:00:00 2001 From: Junping Du Date: Thu, 12 Feb 2015 03:38:54 -0800 Subject: [PATCH] YARN-1580. Documentation error regarding container-allocation.expiry-interval-ms (Brahma Reddy Battula via junping_du) (cherry picked from commit 46c7577b9843766b8cc3e81eae1100d4c194286a) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9933bc11e30..d6f653bd973 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -521,6 +521,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 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 7d0a530e136..0a1d3db3b7f 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 @@ 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. yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs