From f78a68216618c1d55cb6e668fd195f1c98a8bb15 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Sun, 28 Aug 2011 10:39:03 +0000 Subject: [PATCH] Merge -r 1162490:1162491 from trunk to branch-0.23 to fix MAPREDUCE-2893. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162492 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ ...adoop.mapreduce.protocol.ClientProtocolProvider | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 594edc122e9..5407b32ac2d 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1153,6 +1153,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-2885. Fix mapred-config.sh to look for hadoop-config.sh in HADOOP_COMMON_HOME/libexec. (acmurthy) + MAPREDUCE-2893. Remove duplicate entry of YarnClientProtocolProvider in + ClientProtocolProvider services file. (Liang-Chi Hsieh via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider index b4fd93041aa..cc406ee7fe2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider @@ -12,17 +12,3 @@ # limitations under the License. # org.apache.hadoop.mapred.YarnClientProtocolProvider -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -org.apache.hadoop.mapred.YarnClientProtocolProvider \ No newline at end of file