hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From junping...@apache.org
Subject hadoop git commit: YARN-1580. Documentation error regarding container-allocation.expiry-interval-ms (Brahma Reddy Battula via junping_du) (cherry picked from commit 46c7577b9843766b8cc3e81eae1100d4c194286a)
Date Thu, 12 Feb 2015 11:27:50 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 9129b3415 -> 634cc297b


YARN-1580. Documentation error regarding container-allocation.expiry-interval-ms (Brahma Reddy
Battula via junping_du)
(cherry picked from commit 46c7577b9843766b8cc3e81eae1100d4c194286a)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/634cc297
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/634cc297
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/634cc297

Branch: refs/heads/branch-2
Commit: 634cc297baf7ba661a0e8be87488f9aafc4460a3
Parents: 9129b34
Author: Junping Du <junping_du@apache.org>
Authored: Thu Feb 12 03:38:54 2015 -0800
Committer: Junping Du <junping_du@apache.org>
Committed: Thu Feb 12 03:40:57 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/634cc297/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9933bc1..d6f653b 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/634cc297/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 7d0a530..0a1d3db 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>


Mime
View raw message