Commit Graph

1707 Commits

Author SHA1 Message Date
Alejandro Abdelnur 771a5e7dce Merge -r 1213907:1213908 and 1213910:1213911 from trunk to branch. FIXES: HADOOP-7810
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213915 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:29:06 +00:00
Tsz-wo Sze abd9145994 svn merge -c 1213630 from trunk for adding .classpath, .externalToolBuilders, .launches, .project and .settings to svn:ignore of hadoop-mapreduce-project/hadoop-mapreduce-examples.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213632 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 09:46:15 +00:00
Tsz-wo Sze c8171493aa svn merge -c 1213598 from trunk for HADOOP-7914.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213607 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:51:31 +00:00
Eli Collins 5c779078dd HDFS-2654. svn merge -c 1213592/1213593 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213594 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:16:40 +00:00
Eli Collins a3af423143 HDFS-2653. svn merge -c 1213586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213589 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 07:59:07 +00:00
Arun Murthy 88f815fc54 Merge -c 1213575 from trunk to branch-0.23 to fix MAPREDUCE-3537.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213576 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 06:35:10 +00:00
Mahadev Konar f340be0927 MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue -showacls (Jonathan Eagles via mahadev) - Merging r1213511 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213516 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:24:48 +00:00
Mahadev Konar 04cb16ced7 MAPREDUCE-3328. mapred queue -list output inconsistent and missing child queues. (Ravi Prakash via mahadev) - Merging r1213504 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213505 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 23:58:22 +00:00
Mahadev Konar 62edad08e8 MAPREDUCE-3518. mapred queue -info <queue> -showJobs throws NPE. (Jonathan Eagles via mahadev) - Merging r1213464 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213493 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 23:11:38 +00:00
Thomas White c24b4809de Merge -r 1213431:1213432 from trunk to branch-0.23. Fixes: HADOOP-7912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213434 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 20:48:06 +00:00
Thomas White 81ac5efcaf Merge -r 1213349:1213350 from trunk to branch-0.23. Fixes: MAPREDUCE-3527
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213355 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 18:36:28 +00:00
Steve Loughran 2c579d5570 HADOOP-7878 Regression: HADOOP-7777 switch changes break HDFS tests when the isSingleSwitch() predicate is used
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213264 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 15:05:32 +00:00
Konstantin Shvachko c0aeff42ac JDiff output for release 0.22.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213147 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 05:47:46 +00:00
Konstantin Shvachko e69a43dc24 Preparing for release 0.22.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213119 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 00:25:17 +00:00
Eli Collins 8a38dfba87 HADOOP-7898. svn merge -c 1212021 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212837 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 18:25:57 +00:00
Vinod Kumar Vavilapalli f005c3223c MAPREDUCE-3519. Fixed a deadlock in NodeManager LocalDirectories's handling service. Contributed by Ravi Gummadi.
svn merge -c 1212680 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212681 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 23:19:59 +00:00
Alejandro Abdelnur 0f3833fafe Merge -r 1212608:1212609 from trunk to branch. FIXES: HDFS-2511
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212630 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 21:02:38 +00:00
Alejandro Abdelnur 92a02d1530 Merge -r 1212590:1212591 from trunk to branch. FIXES: HADOOP-7902
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212592 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 19:31:15 +00:00
Tsz-wo Sze 518998937b svn merge -c 1212299 from trunk for HDFS-2594.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212301 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 09:34:32 +00:00
Mahadev Konar 24dcbbc524 MAPREDUCE-3513. Capacity Scheduler web UI has a spelling mistake for Memory. (chackaravarthy via mahadev) - Merging r1212215 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212216 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 02:01:22 +00:00
Mahadev Konar a1938ca733 MAPREDUCE-3327. RM web ui scheduler link doesn't show correct max value for queues (Anupam Seth via mahadev) - Merging r1212212 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212213 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 01:44:04 +00:00
Eli Collins 916018a699 HADOOP-7870. svn merge -c 1212084 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212086 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 20:23:05 +00:00
Alejandro Abdelnur d25003ee40 Merge -r 1186959:1186960 from trunk to branch. FIXES: HADOOP-7758
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212080 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 20:10:41 +00:00
Eli Collins dd4707ba71 HADOOP-6886. svn merge -c 1212073 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212078 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 20:06:25 +00:00
Eli Collins 8ebf00f90f HADOOP-6840. svn merge -c 1212062 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212072 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:45:09 +00:00
Alejandro Abdelnur 24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212064 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:30:53 +00:00
Alejandro Abdelnur b4bd2b1d42 Merge -r 1211672:1211673 from trunk to branch. FIXES: HADOOP-7887
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1211675 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:20:30 +00:00
Mahadev Konar 740e269b8f MAPREDUCE-3147. Handle leaf queues with the same name properly. (Ravi Prakash via mahadev) - Merging r1211243 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1211247 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 00:39:22 +00:00
Arun Murthy 194f52bbad Merge -c 1210738 from trunk to branch-0.23 to fix MAPREDUCE-3496.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210739 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 01:37:25 +00:00
Alejandro Abdelnur 6a70420d9d Merge -r 1210547:1210548 from trunk to branch. FIXES: MAPREDUCE-3389
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210550 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 18:04:29 +00:00
Mahadev Konar 63c0db36e2 MAPREDUCE-3485. DISKS_FAILED -101 error code should be defined in same location as ABORTED_CONTAINER_EXIT_STATUS. (Ravi Gummadi via mahadev) - Merging r1210192 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210194 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:12:41 +00:00
Mahadev Konar 3e8e279606 MAPREDUCE-3458. Fix findbugs warnings in hadoop-examples. (Devaraj K via mahadev) - Merging r1210190 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210191 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:00:08 +00:00
Mahadev Konar 7fd4dce613 MAPREDUCE-3456. $HADOOP_PREFIX/bin/yarn should set defaults for $HADOOP_*_HOME (Eric Payne via mahadev) - Merging r1209825 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209826 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 03:44:01 +00:00
Alejandro Abdelnur 89d89cb731 Merge -r 1209812:1209813 from trunk to branch. FIXES: HADOOP-3500
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209815 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 01:09:13 +00:00
Thomas White c4e06b5aac Merge -r 1209790:1209791 from trunk to branch-0.23. Fixes: MAPREDUCE-3479.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209792 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 00:18:17 +00:00
Siddharth Seth e5822af421 merge -c 1209759 from trunk. MAPREDUCE-3453
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209764 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:53:17 +00:00
Siddharth Seth 1912f4c7b8 mrege MAPREDUCE-3460 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209740 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:22:01 +00:00
Alejandro Abdelnur f6d619cab3 Merge -r 1209285:1209286 from trunk to branch. FIXES: HADOOP-7874
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209289 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 22:48:00 +00:00
Thomas White df4a1a9aab Merge -r 1209280:1209281 from trunk to branch-0.23. Fixes: MAPREDUCE-3369
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209283 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 22:34:10 +00:00
Tsz-wo Sze 162413d138 svn merge -c 1209246 from trunk for HADOOP-7877.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209248 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 21:21:47 +00:00
Siddharth Seth 8031aef007 merge MAPREDUCE-3169 amendment (Deprecate MiniMRCluster) from trunk. Constributed by Ahmed Radwan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209239 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 21:09:25 +00:00
Siddharth Seth 463e78db70 merge MAPREDUCE-3443 from trunk. Contributed by Mahadev Konar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209232 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 20:43:34 +00:00
Alejandro Abdelnur 9a8cc9cc0c Merge -r 1208927:1208928 from trunk to branch. FIXES: HDFS-2614
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209163 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 17:29:18 +00:00
Mahadev Konar a7b206219c MAPREDUCE-3452. fifoscheduler web ui page always shows 0% used for the queue. (Jonathan Eagles via mahadev) - Merging r1208999 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209002 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:45:43 +00:00
Mahadev Konar 2ef6051da9 MAPREDUCE-3463. Second AM fails to recover properly when first AM is killed with java.lang.IllegalArgumentException causing lost job. (Siddharth Seth via mahadev) - Merging r1208994 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208995 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:37:14 +00:00
Jitendra Nath Pandey ca3fb12d09 Merged r1208926 from trunk for HADOOP-7854.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208929 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 01:21:23 +00:00
Mahadev Konar 3610bc8c4c MAPREDUCE-3488. Streaming jobs are failing because the main class isnt set in the pom files. (mahadev) - Merging r1208796 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208798 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 21:22:20 +00:00
Alejandro Abdelnur 287c0ffa51 Merge -r 1208767:1208768 from trunk to branch. FIXES: MAPREDUCE-3477
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208770 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 20:51:51 +00:00
Alejandro Abdelnur 04362482a5 Merge -r 1208750:1208751 from trunk to branch. FIXES: HADOOP-7853
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208755 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 20:32:02 +00:00
Mahadev Konar 2ba32989db MAPREDUCE-3450. NM port info no longer available in JobHistory. (Siddharth Seth via mahadev) - Merging r1208327 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208328 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 08:44:52 +00:00