1701 Commits

Author SHA1 Message Date
Tsz-wo Sze
e5a96843b9 Fix a compilation problem introduced by HDFS-2496.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229902 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 06:40:36 +00:00
Tsz-wo Sze
a511422efd svn merge -c 1190611 from trunk for HADOOP-7773.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229891 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 04:22:50 +00:00
Tsz-wo Sze
ffd7148b87 svn merge -c 1190127 from trunk for HDFS-2479.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229887 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 04:02:12 +00:00
Tsz-wo Sze
c493a0e16f svn merge -c 1189901 from trunk for HDFS-2496.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229883 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 03:42:22 +00:00
Tsz-wo Sze
8eed021a88 svn merge -c 1161992 from trunk for HDFS-395.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229881 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 03:36:36 +00:00
Tsz-wo Sze
eaa9af5abf svn merge -c 1188487 from trunk for HDFS-2488.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229492 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 09:21:38 +00:00
Tsz-wo Sze
ae07b88523 svn merge -c 1188436 from trunk for HDFS-2497.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229491 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 09:16:05 +00:00
Tsz-wo Sze
fe433585d6 svn merge -c 1188300 from trunk for HDFS-2481.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229490 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 09:11:22 +00:00
Tsz-wo Sze
3d6c58c0a2 Merge r1188282 and r1188286 from trunk for HDFS-2489.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229489 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 09:07:52 +00:00
Tsz-wo Sze
429be99307 svn merge -c 1187505 from trunk for HDFS-2480.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229487 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 08:48:23 +00:00
Tsz-wo Sze
a04a0ceb45 svn merge -c 1186896 from trunk for HDFS-2459.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229486 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 08:45:42 +00:00
Jitendra Nath Pandey
ea4eb2f011 Merged r1179877 from trunk for HDFS-2181.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229479 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 07:14:15 +00:00
Tsz-wo Sze
302c9e0ef8 svn merge -c 1171711 from trunk for HDFS-2337.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228694 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 18:24:25 +00:00
Tsz-wo Sze
ab663fc96a svn merge -c 1178639 from trunk for HADOOP-7716.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228688 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 18:06:31 +00:00
Tsz-wo Sze
15a9e098cb svn merge -c 1177399 from trunk for HADOOP-7693.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228685 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:59:30 +00:00
Tsz-wo Sze
b0c952da25 svn merge -c 1177002 from trunk for HADOOP-7687.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228683 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:53:18 +00:00
Tsz-wo Sze
7f6f4f26d8 svn merge -c 1173488 from trunk for HDFS-2351.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228679 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:41:22 +00:00
Tsz-wo Sze
09b7f96ccc Remove svn:mergeinfo from .gitignore and some test files.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228676 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:25:06 +00:00
Tsz-wo Sze
6a2e101e8c svn merge -c 1167318 from trunk for MAPREDUCE-2934.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228673 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:21:01 +00:00
Tsz-wo Sze
4384dca37a svn merge -c 1164771 from trunk for MAPREDUCE-2887.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228671 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:16:26 +00:00
Tsz-wo Sze
7fb55be2d3 svn merge -c 1167318 from trunk for HADOOP-7607.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228665 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 16:57:58 +00:00
Tsz-wo Sze
8b906a0dd7 svn merge -c 1166466 from trunk for HDFS-2223.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228662 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 16:52:14 +00:00
Tsz-wo Sze
96692e19e4 svn merge -c 1165826 from trunk for HDFS-2018.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228651 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 16:28:27 +00:00
Tsz-wo Sze
19e62e9b3d svn merge -c 1164771 from trunk for HADOOP-7524.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228081 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 10:59:56 +00:00
Jitendra Nath Pandey
6bfb77a351 Creating branch off branch-0.23 to merge back protobuf changes in HDFS-2060
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1227776 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:21:06 +00:00
Suresh Srinivas
3af44a310d HDFS-2710. Add HDFS tests related to HADOOP-7933. Contributed by Siddarth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227759 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:59:26 +00:00
Suresh Srinivas
c0b64eeeba HDFS-7808 merging change r1227737 from trunk to 0.23 branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227744 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:51:47 +00:00
Siddharth Seth
b988ba01cd merge MAPREDUCE-3615 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227742 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:48:46 +00:00
Siddharth Seth
2d360c5514 merge MAPREDUCE-3569 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227486 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 05:20:40 +00:00
Eli Collins
46bc75cf30 HADOOP-7924. svn merge -c 1227423 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227431 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:49:21 +00:00
Arun Murthy
fa86b57c30 Merge -c 1227426 from trunk to branch-0.23 to fix MAPREDUCE-3572. Moved AM event dispatcher to a separate thread for performance reasons.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227428 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:38:49 +00:00
Arun Murthy
2122954a0d Merge -c 1227422 from trunk to branch-0.23 to fix MAPREDUCE-3566. Fixed MR AM to construct CLC only once across all tasks.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227424 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:34:48 +00:00
Mahadev Konar
e5df95f8cb MAPREDUCE-3478. Cannot build against ZooKeeper 3.4.0. (Tom White via mahadev) - Merging r1227408 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227409 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 00:16:09 +00:00
Siddharth Seth
d296bc2a88 merge MAPREDUCE-3595 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227381 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 23:16:34 +00:00
Siddharth Seth
eb82638bd7 merge MAPREDUCE-3529 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227375 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 23:08:38 +00:00
Alejandro Abdelnur
19f69fa577 Merge -r 1227224:1227225 from trunk to branch. FIXES: HADOOP-7948
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227234 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 17:37:50 +00:00
Vinod Kumar Vavilapalli
16b1c5c24d MAPREDUCE-3490. Fixed MapReduce AM to count failed maps also towards Reduce ramp up. Contributed by Sharad Agarwal and Arun C Murthy.
svn merge -c 1227226 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227227 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 17:12:06 +00:00
Harsh J
aa4147c428 merge MAPREDUCE-3610 (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227098 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 10:18:24 +00:00
Amar Kamat
9bebe5e0b7 MAPREDUCE-3462. Fix Gridmix JUnit testcase failures. (Ravi Prakash and Ravi Gummadi via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227052 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 05:39:28 +00:00
Siddharth Seth
75fb338360 merge HADOOP-7933 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226917 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 19:00:28 +00:00
Harsh J
4f2b026450 merge HDFS-2722 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226880 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 17:20:20 +00:00
Harsh J
e0c776dda9 merge HADOOP-7504 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226352 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 06:34:42 +00:00
Harsh J
c0f4668bd4 merge HDFS-2574
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226212 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 03:16:21 +00:00
Arun Murthy
01b14ae65f Merge -c 1225726 from trunk to branch-0.23 to fix MAPREDUCE-3608.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225728 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 02:24:46 +00:00
Arun Murthy
a178401dc9 Merge -c 1225618 from trunk to branch-0.23 to fix MAPREDUCE-3522.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225619 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 19:07:23 +00:00
Arun Murthy
0e4f690197 Merge -c 1225471 from trunk to branch-0.23 to fix MAPREDUCE-3521.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225472 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:24:41 +00:00
Arun Murthy
c0e9c8bf5e Merge -c 1225463 from trunk to branch-0.23 to fix MAPREDUCE-3547.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225466 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:07:36 +00:00
Arun Murthy
fc62f00ffc Merge -c 1225259 from trunk to branch-0.23 to fix MAPREDUCE-3604.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225261 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:25:13 +00:00
Vinod Kumar Vavilapalli
a1b5b3541e MAPREDUCE-3568. Optimized Job's progress calculations in MR AM. (vinodkv)
svn merge -c 1224995 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224996 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 19:55:56 +00:00
Vinod Kumar Vavilapalli
37d68c060f MAPREDUCE-3399. Modifying ContainerLocalizer to send a heartbeat to NM immediately after downloading a resource instead of always waiting for a second. Contributed by Siddarth Seth.
svn merge -c 1224970 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224971 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:27:51 +00:00