Go to file
Vinod Kumar Vavilapalli c5450fd0fe MAPREDUCE-5832. Fixed TestJobClient to not fail on JDK7 or on Windows. Contributed by Jian He and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1589315 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589316 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 00:02:46 +00:00
dev-support HDFS-5767. Merging change r1564141 from trunk 2014-02-04 00:31:16 +00:00
hadoop-assemblies Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 2014-02-18 04:41:01 +00:00
hadoop-client Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 2014-02-18 04:41:01 +00:00
hadoop-common-project HADOOP-10503. Merging change r1589273 from trunk to branch-2. 2014-04-22 19:58:02 +00:00
hadoop-dist Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 2014-02-18 04:41:01 +00:00
hadoop-hdfs-project HDFS-6178. Merge r1589002 from trunk. 2014-04-21 23:37:58 +00:00
hadoop-mapreduce-project MAPREDUCE-5832. Fixed TestJobClient to not fail on JDK7 or on Windows. Contributed by Jian He and Vinod Kumar Vavilapalli. 2014-04-23 00:02:46 +00:00
hadoop-maven-plugins HADOOP-10503. Merging change r1589273 from trunk to branch-2. 2014-04-22 19:58:02 +00:00
hadoop-minicluster Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 2014-02-18 04:41:01 +00:00
hadoop-project HADOOP-10503. Merging change r1589273 from trunk to branch-2. 2014-04-22 19:58:02 +00:00
hadoop-project-dist Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 2014-02-18 04:41:01 +00:00
hadoop-tools MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2. 2014-04-21 23:49:28 +00:00
hadoop-yarn-project YARN-1970. Merging change r1589001 from trunk to branch-2. 2014-04-21 23:39:16 +00:00
.gitattributes HADOOP-10040. Merging change r1531983 from trunk to branch-2. 2013-10-14 17:14:24 +00:00
.gitignore Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178 2011-12-08 19:30:53 +00:00
BUILDING.txt Merge HADOOP-10350. BUILDING.txt should mention openssl dependency required for hadoop-pipes (Vinayakumar B) 2014-04-10 19:34:36 +00:00
pom.xml Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 2014-02-18 04:41:01 +00:00