Go to file
Vinod Kumar Vavilapalli 614faccf1d YARN-1910. Fixed a race condition in TestAMRMTokens that causes the test to fail more often on Windows. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1586192 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586193 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 01:37:22 +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-10485. Merge r1586059 from trunk. 2014-04-09 18:12:17 +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-6225. Merge r1586181 from trunk. 2014-04-10 00:22:19 +00:00
hadoop-mapreduce-project HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 2014-04-09 11:11:31 +00:00
hadoop-maven-plugins 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-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-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 2014-04-09 11:11:31 +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 HADOOP-10485. Merge r1586059 from trunk. 2014-04-09 18:12:17 +00:00
hadoop-yarn-project YARN-1910. Fixed a race condition in TestAMRMTokens that causes the test to fail more often on Windows. Contributed by Xuan Gong. 2014-04-10 01:37:22 +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 HADOOP-10450. Merging change r1582868 from trunk to branch-2. 2014-03-28 19:53:16 +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