From 96106ff46ed1cff32b44dba878710804e3531af4 Mon Sep 17 00:00:00 2001 From: Sanford Ryza Date: Tue, 1 Apr 2014 00:17:18 +0000 Subject: [PATCH] MAPREDUCE-5759. Remove unnecessary conf load in Limits (Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583498 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../main/java/org/apache/hadoop/mapreduce/counters/Limits.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2680a20b934..5f5adf99a3e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -28,6 +28,8 @@ Release 2.5.0 - UNRELEASED BUG FIXES + MAPREDUCE-5759. Remove unnecessary conf load in Limits (Sandy Ryza) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java index aa1696772ca..34b0fae6e82 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java @@ -27,8 +27,6 @@ import static org.apache.hadoop.mapreduce.MRJobConfig.*; @InterfaceAudience.Private public class Limits { - static final Configuration conf = new JobConf(); - private int totalCounters; private LimitExceededException firstViolation;