svn commit: r1592069 - in /hadoop/common/trunk/hadoop-mapreduce-project: hadoop-mapreduce-client/pom.xml pom.xml

Author: wheat9 Date: Fri May 2 22:26:02 2014 New Revision: 1592069 URL: http://svn.apache.org/r1592069 Log: HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml hadoop/common

svn commit: r1592140 - in /hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project: ./ CHANGES.txt conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

Author: umamahesh Date: Sat May 3 02:29:37 2014 New Revision: 1592140 URL: http://svn.apache.org/r1592140 Log: Merge back from trunk to HDFS-2006 Modified: hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/ (props changed) hadoop/common/branches/HDFS-2006/hadoop-mapreduce-proje