Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-1613. Fixed the typo with the configuration name YARN_HISTORY_SERVICE_ENABLED. Contributed by Akira Ajisaka. 

svn merge --ignore-ancestry -c 1561461 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562226 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2014-01-28 20:51:58 +00:00
parent 65a9a46f2c
commit 060411928c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/CHANGES.txt
View File

@ -34,6 +34,7 @@ Branch YARN-321: Generic ApplicationHistoryService
YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen
via vinodkv) via vinodkv)
<<<<<<< .working
YARN-1123. Added a new ContainerReport and its Protobuf implementation. (Mayank YARN-1123. Added a new ContainerReport and its Protobuf implementation. (Mayank
Bansal via vinodkv) Bansal via vinodkv)
@ -94,6 +95,9 @@ Branch YARN-321: Generic ApplicationHistoryService
YARN-1625. Fixed RAT warnings after YARN-321 merge. (Shinichi Yamashita via YARN-1625. Fixed RAT warnings after YARN-321 merge. (Shinichi Yamashita via
vinodkv) vinodkv)
YARN-1613. Fixed the typo with the configuration name
YARN_HISTORY_SERVICE_ENABLED. (Akira Ajisaka via vinodkv)
Release 2.4.0 - UNRELEASED Release 2.4.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
View File

@ -950,7 +950,7 @@ public class YarnConfiguration extends Configuration {
/** The setting that controls whether history-service is enabled or not.. */ /** The setting that controls whether history-service is enabled or not.. */
public static final String YARN_HISTORY_SERVICE_ENABLED = AHS_PREFIX public static final String YARN_HISTORY_SERVICE_ENABLED = AHS_PREFIX
+ ".enabled"; + "enabled";
public static final boolean DEFAULT_YARN_HISTORY_SERVICE_ENABLED = false; public static final boolean DEFAULT_YARN_HISTORY_SERVICE_ENABLED = false;
/** URI for FileSystemApplicationHistoryStore */ /** URI for FileSystemApplicationHistoryStore */