svn commit: r1561771 - in /hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-client/hadoop-m

Author: cnauroth Date: Mon Jan 27 18:09:22 2014 New Revision: 1561771 URL: http://svn.apache.org/r1561771 Log: Merge trunk to HDFS-4685. Modified: hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/ (props changed) hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/CHANGES

svn commit: r1561802 - in /hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-client/hadoop-m

Author: jing9 Date: Mon Jan 27 19:31:47 2014 New Revision: 1561802 URL: http://svn.apache.org/r1561802 Log: Merging r1560794 through r1561801 from trunk. Modified: hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/ (props changed) hadoop/common/branches/HDFS-5698/hadoop-mapreduc

svn commit: r1561959 - in /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client: hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/ hadoop-mapreduce-client-c

Author: suresh Date: Tue Jan 28 07:32:52 2014 New Revision: 1561959 URL: http://svn.apache.org/r1561959 Log: HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Contributed by Haohui Mai. Modified: hadoop/common/trunk/hadoop-mapreduce-pro

svn commit: r1561966 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client: hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/ hadoop-mapred

Author: suresh Date: Tue Jan 28 07:47:37 2014 New Revision: 1561966 URL: http://svn.apache.org/r1561966 Log: HADOOP-10255. Merge 1561959 and 1561961 from trunk. Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/jav