Commit Graph

615 Commits

Author SHA1 Message Date
Arun Murthy c09246b2e8 Fixed broken merge for MAPREDUCE-2987
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171924 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 07:16:47 +00:00
Arun Murthy 9146f43c8d Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171902 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 05:53:28 +00:00
Mahadev Konar 66ad5a6154 MAPREDUCE-2672. MR-279: JobHistory Server needs Analysis this job. (Robert Evans via mahadev) - Merging r1171297 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171299 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 22:23:11 +00:00
Vinod Kumar Vavilapalli cc9f49a7cb MAPREDUCE-2979. svn merge -c r1169808 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169810 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 16:03:01 +00:00
Mahadev Konar 5bb361cee4 MAPREDUCE-2971. ant build mapreduce fails protected access jc.displayJobList (jobs) (Thomas Graves via mahadev) - merging 1167383 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167384 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 22:45:41 +00:00
Arun Murthy a9b04ba0e9 Adding back hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources which was missed during merge of MAPREDUCE-279.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166973 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:53:41 +00:00
Arun Murthy 3dd8d9476b Merge -r 1166954:1166955 from trunk to branch-0.23 to fix MAPREDUCE-2864.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166957 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 01:58:40 +00:00
Arun Murthy dc896c8bc6 Merge -r 1166837:1166838 from trunk to branch-0.23 to fix MAPREDUCE-2908.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166840 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:28:14 +00:00
Arun Murthy e7c0ee77c6 Merge -r 1165929:1165930 from trunk to branch-0.23 to fix MAPREDUCE-2800.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165932 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 23:37:04 +00:00
Arun Murthy e5e45c4f1b Merge -r 1164254:1164255 from trunk to branch-0.23 to fix MAPREDUCE-2756.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164258 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 20:26:12 +00:00
Aaron Myers 8019d90630 HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164179 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 17:24:05 +00:00
Mahadev Konar e123403fda MAPREDUCE-2886. Fix Javadoc warnings in MapReduce. (mahadev) - Merge r1163050 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163051 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 23:31:00 +00:00
Mahadev Konar 0165337cc0 MAPREDUCE-2737. Update the progress of jobs on client side. (Siddharth Seth and Mahadev Konar via mahadev) - Merging from trunk r1162979
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162984 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 20:26:04 +00:00
Mahadev Konar 7c85f33ce1 MAPREDUCE-2877. Add missing Apache license header in some files in MR and also add the rat plugin to the poms. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161650 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 17:16:36 +00:00
Arun Murthy cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161332 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 00:14:24 +00:00