Repository: hadoop Updated Branches: refs/heads/branch-2 80697e4f3 -> 3b9698eca
YARN-3824. Fix two minor nits in member variable properties of YarnConfiguration. Contributed by Ray Chiang. (cherry picked from commit 2ad668748e2535e25e3b04656c29034d58074027) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3b9698ec Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3b9698ec Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3b9698ec Branch: refs/heads/branch-2 Commit: 3b9698ecac75326d0cd88929189eaed782b9b8b2 Parents: 80697e4 Author: Devaraj K <deva...@apache.org> Authored: Thu Jun 18 16:44:08 2015 +0530 Committer: Devaraj K <deva...@apache.org> Committed: Thu Jun 18 16:46:33 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b9698ec/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b45e0c3..7a43bef 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -488,6 +488,9 @@ Release 2.8.0 - UNRELEASED YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() returning always -1. (J.Andreina via devaraj) + YARN-3824. Fix two minor nits in member variable properties + of YarnConfiguration. (Ray Chiang via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b9698ec/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index e06ec1c..a777d7e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -278,7 +278,7 @@ public class YarnConfiguration extends Configuration { + "intermediate-data-encryption.enable"; @Private - public static final Boolean DEFAULT_YARN_INTERMEDIATE_DATA_ENCRYPTION = false; + public static final boolean DEFAULT_YARN_INTERMEDIATE_DATA_ENCRYPTION = false; /** The address of the RM admin interface.*/ public static final String RM_ADMIN_ADDRESS = @@ -729,7 +729,7 @@ public class YarnConfiguration extends Configuration { public static final String RM_PROXY_USER_PRIVILEGES_ENABLED = RM_PREFIX + "proxy-user-privileges.enabled"; - public static boolean DEFAULT_RM_PROXY_USER_PRIVILEGES_ENABLED = false; + public static final boolean DEFAULT_RM_PROXY_USER_PRIVILEGES_ENABLED = false; /** * How many diagnostics/failure messages can be saved in RM for
