Repository: hadoop Updated Branches: refs/heads/trunk 37577852b -> 6eae4337d
MAPREDUCE-6613. Change mapreduce.jobhistory.jhist.format default from json to binary (rchiang via rkanter) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6eae4337 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6eae4337 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6eae4337 Branch: refs/heads/trunk Commit: 6eae4337d1929077ffa74734327775fb987ba910 Parents: 3757785 Author: Robert Kanter <[email protected]> Authored: Fri Feb 19 17:15:54 2016 -0800 Committer: Robert Kanter <[email protected]> Committed: Fri Feb 19 17:15:54 2016 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java | 2 +- .../src/main/resources/mapred-default.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6eae4337/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index bf9d824..f0ad171 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -16,6 +16,9 @@ Trunk (Unreleased) MAPREDUCE-6336. Enable v2 FileOutputCommitter by default. (Siqi Li via gera) + MAPREDUCE-6613. Change mapreduce.jobhistory.jhist.format default from + json to binary (rchiang via rkanter) + NEW FEATURES MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk) http://git-wip-us.apache.org/repos/asf/hadoop/blob/6eae4337/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java index 86dfad3..2277ef6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java @@ -227,5 +227,5 @@ public class JHAdminConfig { public static final String MR_HS_JHIST_FORMAT = MR_HISTORY_PREFIX + "jhist.format"; public static final String DEFAULT_MR_HS_JHIST_FORMAT = - "json"; + "binary"; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/6eae4337/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index efbbf53..d87085f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -1754,7 +1754,7 @@ values are "json" for text output and "binary" for faster parsing. </description> <name>mapreduce.jobhistory.jhist.format</name> - <value>json</value> + <value>binary</value> </property> <property>
