From 78efd4fd5c9ebb0427cd712bf3d6e3cdf0144717 Mon Sep 17 00:00:00 2001 From: Zhijie Shen Date: Wed, 22 Oct 2014 18:39:29 -0700 Subject: [PATCH] YARN-2732. Fixed syntax error in SecureContainer.apt.vm. Contributed by Jian He. (cherry picked from commit b94b8b30f282563ee2ecdd25761b2345aaf06c9b) --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../hadoop-yarn-site/src/site/apt/SecureContainer.apt.vm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d44e1ca86e5..184fe50201d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -668,6 +668,8 @@ Release 2.6.0 - UNRELEASED YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it retries creating znode. (Jian He via zjshen) + YARN-2732. Fixed syntax error in SecureContainer.apt.vm. (Jian He via zjshen) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SecureContainer.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SecureContainer.apt.vm index 722870ca38a..0365bf7589b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SecureContainer.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SecureContainer.apt.vm @@ -111,7 +111,7 @@ min.user.id=1000#Prevent other super-users +---+ *** wsce-site.xml - The hadoopwinutilsvc uses <<<%HADOOP_HOME%\etc\hadoop\wsce_site.xml to configure access to the privileged operations. + The hadoopwinutilsvc uses <<<%HADOOP_HOME%\etc\hadoop\wsce_site.xml>>> to configure access to the privileged operations. +---+