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

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
This commit is contained in:
Arun Murthy 2011-08-28 10:39:03 +00:00
parent 02cf28ece0
commit f78a682166
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -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

14
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider
View File

@ -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