Commit Graph

457 Commits

Author SHA1 Message Date
Mahadev Konar 1f34b6835a MAPREDUCE-3454. [Gridmix] TestDistCacheEmulation is broken (Hitesh Shah via mahadev) - Merging r1205143 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205144 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 19:49:21 +00:00
Amar Kamat 4edef50820 MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204892 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 10:04:42 +00:00
Mahadev Konar c24ffde7aa MAPREDUCE-3444. trunk/0.23 builds broken (Hitesh Shah via mahadev) - Merging r1204698 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204700 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 20:58:43 +00:00
Mahadev Konar 1138b2e0b0 MAPREDUCE-3447. mapreduce examples not working (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204696 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 20:51:46 +00:00
Mahadev Konar df0d4c1d5e MAPREDUCE-3434. Nightly build broken (Hitesh Shah via mahadev) - merging r1204638 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204641 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 18:28:12 +00:00
Todd Lipcon dd8f0423e3 MAPREDUCE-3437. Fix examples pom to refer to the correct 0.23 snapshot version. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204368 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 06:50:03 +00:00
Thomas White 1f0fc2da93 Merge -r 1203487:1203488 from trunk to branch-0.23. Fixes: MAPREDUCE-3372
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203489 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 05:15:17 +00:00
Thomas White 90158a3ec2 Merge -r 1203454:1203455 from trunk to branch-0.23. Fixes: MAPREDUCE-3373
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203458 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 01:01:20 +00:00
Alejandro Abdelnur a24139e043 Merge -r 1203410:1203411 from trunk to branch. FIXES: MAPREDUCE-3415
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203415 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 23:10:37 +00:00
Alejandro Abdelnur 124d34995a Merge -r 1203370:1203371 from trunk to branch. FIXES: MAPREDUCE-3169
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203402 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 22:48:13 +00:00
Vinod Kumar Vavilapalli 7b8e41d6a1 MAPREDUCE-3407. Fixed pom files to refer to the correct MR app-jar needed by the integration tests. Contributed by Hitesh Shah.
svn merge -c r1202766 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202768 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 16:31:37 +00:00
Vinod Kumar Vavilapalli 6a1621e32c MAPREDUCE-3355. Fixed MR AM's ContainerLauncher to handle node-command timeouts correctly. (vinodkv)
svn merge -c r1202744 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202745 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 15:40:05 +00:00
Vinod Kumar Vavilapalli 0e3715e98f MAPREDUCE-3102. Changed NodeManager to fail fast when LinuxContainerExecutor has wrong configuration or permissions. Contributed by Hitesh Shah.
svn merge -c r1202117 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202118 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 10:32:55 +00:00
Mahadev Konar 7934940eb8 MAPREDUCE-3331. Improvement to single node cluster setup documentation for 0.23 (Anupam Seth via mahadev) - Merging r1202002 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202004 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 02:06:52 +00:00
Amar Kamat c799c3b2e7 MAPREDUCE-3375. [Gridmix] Memory Emulation system tests. (Vinay Thota via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201999 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 01:52:14 +00:00
Mahadev Konar 29ef7ef0df MAPREDUCE-3243. Invalid tracking URL for streaming jobs (Jonathan Eagles via mahadev) - Merging r1201951 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201952 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 22:46:15 +00:00
Mahadev Konar 6aa52c35d3 MAPREDUCE-3341. Enhance logging of initalized queue limit values. (Anupam Seth via mahadev) - Merging r1201947 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201949 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 22:40:53 +00:00
Mahadev Konar 526e738813 MAPREDUCE-3325. Improvements to CapacityScheduler doc. (Thomas Graves via mahadev) - Merging r1201925 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201927 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 22:02:02 +00:00
Mahadev Konar 686975c9fb MAPREDUCE-3324. Not All HttpServer tools links (stacks,logs,config,metrics) are accessible through all UI servers (Jonathan Eagles via mahadev) - Merging r1201914 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201916 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 21:31:38 +00:00
Vinod Kumar Vavilapalli effbbdda63 MAPREDUCE-3370. Fixed CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200778 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 08:55:55 +00:00
Vinod Kumar Vavilapalli 5c88a335b4 MAPREDUCE-3379. Fixed LocalResourceTracker in NodeManager to remove deleted cache entries correctly. Contributed by Siddharth Seth.
svn merge -c r1200747 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200748 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 06:32:23 +00:00
Vinod Kumar Vavilapalli 5ac8276168 MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null when there isn't a supported token. Contributed by John George.
svn merge -c r1200484 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200485 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:21:29 +00:00
Vinod Kumar Vavilapalli b7ff3d01b5 MAPREDUCE-3280. Removed the unnecessary job user-name configuration in mapred-site.xml. (vinodkv)
svn merge -c r1200441 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200444 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 17:31:14 +00:00
Vinod Kumar Vavilapalli cfbea52bd9 MAPREDUCE-3333. Fixed bugs in ContainerLauncher of MR AppMaster due to which per-container connections to NodeManager were lingering long enough to hit the ulimits on number of processes. (vinodkv)
svn merge -c r1199751 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199757 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 13:45:02 +00:00
Vinod Kumar Vavilapalli e430e1a921 MAPREDUCE-3336. Replaced guice internal.Preconditions api usage with the public Preconditions API. Contributed by Thomas Graves.
svn merge -c r1199714 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199716 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 12:42:27 +00:00
Amar Kamat 4989aeb6b1 MAPREDUCE-2733. [Gridmix] Gridmix3 cpu emulation system tests. (Vinay Thota via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199688 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 10:29:42 +00:00
Vinod Kumar Vavilapalli 3a4f39cd07 MAPREDUCE-3368. Fixed test compilation. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199627 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 06:28:41 +00:00
Vinod Kumar Vavilapalli 7db30f8428 MAPREDUCE-3345. Fixed a race condition in ResourceManager that was causing TestContainerManagerSecurity to fail sometimes. Contributed by Hitesh Shah.
svn merge -c r1199144 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199145 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:57:23 +00:00
Vinod Kumar Vavilapalli fe6c20b02a MAPREDUCE-3342. Fixed JobHistoryServer to also show the job's queue name. Contributed by Jonathan Eagles.
svn merge -c r1199133 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199135 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:30:56 +00:00
Amar Kamat fcf44394a0 MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199106 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 04:48:57 +00:00
Thomas White 4f5fdb21cc Merge -r 1198909:1198910 from trunk to branch-0.23. Fixes: MAPREDUCE-3344.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198914 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 20:16:12 +00:00
Mahadev Konar 4657411161 MAPREDUCE-3291. App fail to launch due to delegation token not found in cache (Robert Evans via mahadev) -Merging r1198583 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198585 13f79535-47bb-0310-9956-ffa450edef68
2011-11-06 23:04:35 +00:00
Vinod Kumar Vavilapalli 337f4f4e79 MAPREDUCE-3217. Reenabled and fixed bugs in the failing ant test TestAuditLogger. Contributed by Devaraj K.
svn merge -c r1197438 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1197441 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 09:03:33 +00:00
Vinod Kumar Vavilapalli 2ecdc2b8a2 MAPREDUCE-3219. Reenabled and fixed bugs in the failing test TestDelegationToken. Contributed by Hitesh Shah.
svn merge -c r1197415 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1197416 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 07:49:45 +00:00
Vinod Kumar Vavilapalli ffc80a1e1d MAPREDUCE-3215. Reneabled and fixed bugs in the failing test TestNoJobSetupCleanup. Contributed by Hitesh Shah.
svn merge -c r1197101 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1197102 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 13:21:32 +00:00
Vinod Kumar Vavilapalli 167f920da5 MAPREDUCE-3221. Reneabled the previously ignored test in TestSubmitJob and fixed bugs in it. Contributed by Devaraj K.
svn merge -c r1197080 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1197082 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 12:27:30 +00:00
Vinod Kumar Vavilapalli b793e277aa MAPREDUCE-3297. Moved log related components into yarn-common so that HistoryServer and clients can use them without depending on the yarn-server-nodemanager module. Contributed by Siddharth Seth.
svn merge -c r1196986 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196988 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 08:07:16 +00:00
Arun Murthy 46d9ffc886 Merge -c 1196977 from trunk to branch-0.23 to fix MAPREDUCE-3337.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196978 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 07:08:33 +00:00
Jakob Homan 5ed437781f MAPREDUCE-3139. Merge from trunk to 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196783 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 19:57:19 +00:00
Mahadev Konar 09f1d226ea MAPREDUCE-3332. contrib/raid compile breaks due to changes in hdfs/protocol/datatransfer/Sender#writeBlock related to checksum handling (Hitesh Shah via mahadev) -Merging r1196356 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196366 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 23:10:34 +00:00
Arun Murthy 6b0d46e6d2 Preparing for release 0.23.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195874 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 08:46:58 +00:00
Arun Murthy 5ca041a888 Preparing for release 0.23.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195839 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 06:03:37 +00:00
Mahadev Konar ff4146e5bb MAPREDUCE-3317. Rumen TraceBuilder is emiting null as hostname. (Ravi Gummadi via mahadev) - Merging r1195814 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195815 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:33:40 +00:00
Mahadev Konar 61e69297d9 MAPREDUCE-3316. Rebooted link is not working properly. (Bhallamudi Venkata Siva Kamesh via mahadev) - Merging r1195805 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195806 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:09:13 +00:00
Arun Murthy e6f85573e7 Merge -c 1195792 from trunk to branch-0.23 to fix MAPREDUCE-3237.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195793 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 03:19:48 +00:00
Arun Murthy bac6f1592a Fixing CHANGES.txt to reflect 0.23 content.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195767 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 02:10:13 +00:00
Arun Murthy 76224deb1a Merge -c 1195764 from trunk to branch-0.23 to fix MAPREDUCE-3322.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195765 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 02:01:54 +00:00
Mahadev Konar 17795f65ea MAPREDUCE-3103. Implement Job ACLs for MRAppMaster. (mahadev) - Merging r1195761 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195763 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 01:54:20 +00:00
Arun Murthy d9c2bf148b Merge -c 1195745 from trunk to branch-0.23 to fix MAPREDUCE-3220.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195746 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 01:05:04 +00:00
Arun Murthy 85ab392795 Merge -c 1195743 from trunk to branch-0.23 to fix MAPREDUCE-3321.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195744 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 00:59:13 +00:00
Arun Murthy d6d2ff8206 Merge -c 1195579 from trunk to branch-0.23 to fix MAPREDUCE-3275.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195581 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 17:34:25 +00:00
Arun Murthy 07c755a394 Merge -c 1195575 from trunk to branch-0.23 to fix MAPREDUCE-3035.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195576 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 17:29:35 +00:00
Amar Kamat 5b201c3fcb MAPREDUCE-3241. [Rumen] Fix Rumen to ignore the AMStartedEvent. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195548 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 16:19:05 +00:00
Amar Kamat 29ba7087a6 MAPREDUCE-3166. [Rumen] Make Rumen use job history api instead of relying on current history file name format. (Ravi Gummadi via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195540 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 16:02:00 +00:00
Amar Kamat bef5373b02 MAPREDUCE-3157. [Rumen] Fix TraceBuilder to handle 0.20 history file names also. (Ravi Gummadi via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195538 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 15:58:57 +00:00
Vinod Kumar Vavilapalli 539db85f7d MAPREDUCE-3262. Fixed Container's state-machine in NodeManager to handle a couple of events in failure states correctly. Contributed by Hitesh Shah and Siddharth Seth.
svn merge -c r1195416 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195417 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 11:30:56 +00:00
Vinod Kumar Vavilapalli cee984b9b3 MAPREDUCE-2696. Fixed NodeManager to cleanup logs in a thread when logs' aggregation is not enabled. Contributed by Siddharth Seth.
svn merge -c r1195383 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195387 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 10:00:55 +00:00
Vinod Kumar Vavilapalli 4b4b1c89cc MAPREDUCE-3146. Added a MR specific command line to dump logs for a given TaskAttemptID. Contributed by Siddharth Seth.
svn merge -c r1195349 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195353 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:48:08 +00:00
Vinod Kumar Vavilapalli 8c3065c971 MAPREDUCE-2766. Fixed NM to set secure permissions for files and directories in distributed-cache. Contributed by Hitesh Shah.
svn merge -c r1195340 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195341 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 05:53:14 +00:00
Vinod Kumar Vavilapalli 5175fc6e77 MAPREDUCE-3313. Fixed initialization of ClusterMetrics which was failing TestResourceTrackerService sometimes. Contributed by Hitesh Shah.
svn merge -c r1195319 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195320 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 03:33:42 +00:00
Mahadev Konar f3fb6017e8 MAPREDUCE-3171 merge from trunk reverted changes from MAPREDUCE-2747 MAPREDUCE-3240.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195257 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 21:45:45 +00:00
Vinod Kumar Vavilapalli 80ecd29d8a MAPREDUCE-3274. Fixed a race condition in MRAppMaster that was causing a task-scheduling deadlock. Contributed by Robert Joseph Evans.
svn merge -c r1195145 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195146 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 11:33:34 +00:00
Arun Murthy 6f2f253446 Merge -c 1194850 from trunk to branch-0.23 to fix MAPREDUCE-3256.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1194851 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 09:37:02 +00:00
Alejandro Abdelnur 954b0ff8ab Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190671 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:30:05 +00:00
Alejandro Abdelnur f885fdc98e Merge -r 1187061:1187062 from trunk to branch. FIXES: MAPREDUCE-3204
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190668 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:18:18 +00:00
Alejandro Abdelnur 073139bb57 Merge -r 1185966:1185967 from trunk to branch. FIXES: MAPREDUCE-3199
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190667 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:14:55 +00:00
Alejandro Abdelnur 0eba9bcc06 Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:36:55 +00:00
Alejandro Abdelnur 89d8dedfbe Merge -r 1183159:1183160 from trunk to branch. FIXES: MAPREDUCE-3183
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190639 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:29:43 +00:00
Alejandro Abdelnur d81d704d2e Merge -r 1182574:1182575 from trunk to branch. FIXES: MAPREDUCE-3171
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190619 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:03:21 +00:00
Alejandro Abdelnur 2d06ac8a28 Merge -r 1180115:1180116 from trunk to branch. FIXES: MAPREDUCE-3014
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190594 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:34:14 +00:00
Mahadev Konar bd6a83f5d3 MAPREDUCE-3295. TestAMAuthorization failing on branch 0.23. (vinodkv via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190528 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 20:00:54 +00:00
Vinod Kumar Vavilapalli c4cf38dfc2 MAPREDUCE-3306. Fixed a bug in NodeManager ApplicationImpl that was causing NodeManager to crash. (vinodkv)
svn merge -c r1190523 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190526 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 19:53:00 +00:00
Arun Murthy f9376e264d Merge -c 1190495 from trunk to branch-0.23 to fix MAPREDUCE-3304.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190496 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 18:46:27 +00:00
Vinod Kumar Vavilapalli e20f1826f3 MAPREDUCE-2775. Fixed ResourceManager and NodeManager to force a decommissioned node to shutdown. Contributed by Devaraj K.
svn merge -c r1190467 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190468 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 17:40:45 +00:00
Vinod Kumar Vavilapalli 4fbaa0ff46 MAPREDUCE-3296. Fixed the remaining nine FindBugs warnings. (vinodkv)
svn merge -c r1190187 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190188 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 07:46:21 +00:00
Vinod Kumar Vavilapalli fc8079e054 MAPREDUCE-2989. Modified JobHistory to link to task and AM logs from the JobHistoryServer. Contributed by Siddharth Seth.
svn merge -c r1190174 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:52:40 +00:00
Mahadev Konar 06e892c3e1 MAPREDUCE-3292. In secure mode job submission fails with Provider org.apache.hadoop.mapreduce.security.token.JobTokenIndentifier not found. (mahadev) - Merging r1190171 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190172 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:15:18 +00:00
Mahadev Konar 404817b294 MAPREDUCE-3185. RM Web UI does not sort the columns in some cases. (Jonathan Eagles via mahadev) - Merging r1190165 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190166 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:06:35 +00:00
Arun Murthy eb8b480e95 Merge -c 1190162 from trunk to branch-0.23 to fix MAPREDUCE-3290.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190163 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 05:46:28 +00:00
Arun Murthy 524b2d514f Merge -c 1190160 from trunk to branch-0.23 to fix MAPREDUCE-3258.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190161 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 05:08:53 +00:00
Mahadev Konar 33f5d87591 MAPREDUCE-3285. Tests on branch-0.23 failing (Siddharth Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190138 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 02:25:57 +00:00
Mahadev Konar e8b692c4f6 MAPREDUCE-3186. User jobs are getting hanged if the Resource manager process goes down and comes up while job is getting executed. (Eric Payne via mahadev) - Merging r1190122 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190123 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 01:42:21 +00:00
Mahadev Konar 0b0404822c MAPREDUCE-3282. bin/mapred job -list throws exception. (acmurthy via mahadev) - Merging r1190110 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190112 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 01:19:09 +00:00
Arun Murthy 0991b7560e Merge -c 1190084 from trunk to branch-0.23 to fix MAPREDUCE-3284.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190086 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 23:24:15 +00:00
Eli Collins 36f5e59b1f MAPREDUCE-2736. svn merge -c 1189982 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190008 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 20:39:31 +00:00
Arun Murthy 4499878392 Merge -c 1189879 from trunk to branch-0.23 to fix MAPREDUCE-3228.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189880 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 17:32:39 +00:00
Vinod Kumar Vavilapalli 4f1d9492f0 MAPREDUCE-3281. Fixed a bug in TestLinuxContainerExecutorWithMocks. (vinodkv)
svn merge -c r1189818 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189819 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 15:57:06 +00:00
Vinod Kumar Vavilapalli 28676b5345 MAPREDUCE-2986. Fixed MiniYARNCluster to support multiple NodeManagers. Contributed by Anupam Seth.
svn merge -c r1189721 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189723 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:44:57 +00:00
Vinod Kumar Vavilapalli c5028eaa38 MAPREDUCE-3240. Fixed NodeManager to be able to forcefully cleanup its containers (process-trees) irrespective of whether the container succeeded, or killed. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189713 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:06:08 +00:00
Arun Murthy d5ae121690 Merge -c 1189670 from trunk to branch-0.23 to fix MAPREDUCE-3279.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189672 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 08:32:18 +00:00
Arun Murthy e18d2cdb31 Merge -c 1189667 from trunk to branch-0.23 to fix MAPREDUCE-3259.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189668 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 08:29:40 +00:00
Arun Murthy 23eb484fa1 Merge -c 1189630 from trunk to branch-0.23 to fix MAPREDUCE-3257.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189631 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:25:07 +00:00
Arun Murthy 6954b24c9d Merge -c 1189619 from trunk to branch-0.23 to fix MAPREDUCE-3175.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189628 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:21:30 +00:00
Mahadev Konar 43ef9dbcb5 MAPREDUCE-3264. mapreduce.job.user.name needs to be set automatically. (acmurthy via mahadev) - Merging r1189616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189617 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:06:30 +00:00
Arun Murthy 3e04036dbe Merge -c 1189587 from trunk to branch-0.23 to fix MAPREDUCE-3254.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189588 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 02:47:35 +00:00
Arun Murthy ea7c670969 Merge -c 1189542 from trunk to branch-0.23 to fix MAPREDUCE-3205.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189543 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 23:59:21 +00:00
Arun Murthy b211fc72cc Merge -c 1189036 from trunk to branch-0.23 to fix for MAPREDUCE-2858.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189037 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 06:32:26 +00:00
Mahadev Konar 383b8ed9d9 MAPREDUCE-3250. When AM restarts, client keeps reconnecting to the new AM and prints a lots of logs. (vinodkv via mahadev) - Merging r1189023 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189024 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 04:35:40 +00:00
Arun Murthy 4dd5c3169d Merge -c 1188999 from trunk to branch-0.23 to complete fix for MAPREDUCE-3269.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189000 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 02:17:05 +00:00
Arun Murthy d78033e453 Merge -c 1188997 from trunk to branch-0.23 to complete fix for MAPREDUCE-3263.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188998 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 02:13:29 +00:00
Arun Murthy d22a142f94 Merge -c 1188842 from trunk to branch-0.23 to complete fix for MAPREDUCE-3253.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188843 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 18:14:45 +00:00
Arun Murthy 1bef05715d Merge -c 1188528 from trunk to branch-0.23 to complete fix for MAPREDUCE-2821.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188529 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 06:27:24 +00:00
Mahadev Konar ddccefbefb MAPREDUCE-2746. Yarn servers can't communicate with each other with hadoop.security.authorization set to true (acmurthy via mahadev) - Merging r1188522 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188524 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 06:12:14 +00:00
Arun Murthy 88c24ca831 Merge -c 1188466 from trunk to branch-0.23 to complete fix for MAPREDUCE-3159.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188468 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 00:42:56 +00:00
Arun Murthy 1527edc627 Merge -c 1188388 from trunk to branch-0.23 to complete fix for MAPREDUCE-3252.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188467 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 00:41:52 +00:00
Todd Lipcon 21ded50c4d MAPREDUCE-3252. Fix map tasks to not rewrite data an extra time when map output fits in spill buffer. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188423 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 22:32:47 +00:00
Arun Murthy 28d52eabfa Merge -c 1188377 from trunk to branch-0.23 to complete fix for MAPREDUCE-3028.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188378 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 21:03:22 +00:00
Vinod Kumar Vavilapalli df7a66844b MAPREDUCE-2747. Cleaned up LinuxContainerExecutor binary sources and changed the configuration to use yarn names. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188261 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 17:59:30 +00:00
Vinod Kumar Vavilapalli 6069c2a82d MAPREDUCE-2708. Designed and implemented MR Application Master recovery to make MR AMs resume their progress after restart. Contributed by Sharad Agarwal.
svn merge -c r1188043 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188044 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 08:44:54 +00:00
Vinod Kumar Vavilapalli b9e90a3319 MAPREDUCE-3233. Fixed a bug in MR Job so as to be able to restart the application on AM crash. Contributed by Mahadev Konar.
svn merge -c r1187669 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187670 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 08:13:20 +00:00
Vinod Kumar Vavilapalli 56072a170d MAPREDUCE-3087. Fixed the mapreduce classpath to correctly include the generated-classpath file needed for tests. Contributed by Ravi Prakash.
svn merge -c r1187658 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187659 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 06:48:42 +00:00
Vinod Kumar Vavilapalli 1605fb7dbc MAPREDUCE-3058. Fixed MR YarnChild to report failure when task throws an error and thus prevent a hanging task and job. (vinodkv)
svn merge -c r1187654 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187655 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 06:17:25 +00:00
Mahadev Konar abae89ed32 MAPREDUCE-3242. Trunk compilation broken with bad interaction from MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev) - Merging r1187587 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187589 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 22:48:29 +00:00
Mahadev Konar cbd1258918 MAPREDUCE-3239. Use new createSocketAddr API in MRv2 to give better error messages on misconfig (Todd Lipcon via mahadev) - Merging r1187556 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187558 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:38:45 +00:00
Arun Murthy 59348f53a1 Merge -c 1187496 from trunk to branch-0.23 to complete fix for MAPREDUCE-3070.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187497 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 18:48:07 +00:00
Mahadev Konar 1edb5c8f9e MAPREDUCE-3163. JobClient spews errors when killing MR2 job. (mahadev) - Merging r1187491 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187492 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 18:38:26 +00:00
Todd Lipcon 5acc010db8 MAPREDUCE-2629. Workaround a JVM class loading quirk which prevents JIT compilation of inner classes methods in ReduceContextImpl. Contributed by Eric Caspole.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187182 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 05:20:14 +00:00
Arun Murthy fe370841e6 Merge -c 1187116 from trunk to branch-0.23 to complete fix for MAPREDUCE-3226.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187119 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 22:45:08 +00:00
Vinod Kumar Vavilapalli 9a8b923418 MAPREDUCE-3104. Implemented Application-acls. (vinodkv)
svn merge -c r1186748 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186754 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 12:01:54 +00:00
Arun Murthy ffccd70d7a Merge -c 1186554 from trunk to branch-0.23 to complete fix for MAPREDUCE-3188.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186555 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 23:00:07 +00:00
Arun Murthy 2115478185 Merge -c 1186552 from trunk to branch-0.23 to complete fix for MAPREDUCE-3179.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186553 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:55:07 +00:00
Arun Murthy 797ee4c4d3 Merge -c 1186546 from trunk to branch-0.23 to complete fix for MAPREDUCE-3212.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186547 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:43:27 +00:00
Arun Murthy c56916f582 Merge -c 1186542 from trunk to branch-0.23 to complete fix for MAPREDUCE-3208.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186544 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:38:53 +00:00
Arun Murthy 38a73eebaf Merge -c 1186529 from trunk to branch-0.23 to complete fix for MAPREDUCE-2693.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186530 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:02:57 +00:00
Arun Murthy 9895a6353b Merge -c 1186467 from trunk to branch-0.23 to complete fix for MAPREDUCE-2788.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186468 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 20:37:51 +00:00
Arun Murthy cad9bc8843 Merge -c 1186458 from trunk to branch-0.23 to complete fix for MAPREDUCE-3181.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186459 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 20:28:49 +00:00
Vinod Kumar Vavilapalli 3b39b29b9c MAPREDUCE-3176. Fixed ant mapreduce tests that are timing out because of wrong framework name. Contributed by Hitesh Shah.
svn merge -c r1186368 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186369 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 17:58:32 +00:00
Vinod Kumar Vavilapalli db1c89fd51 MAPREDUCE-3162. Separated application-init and container-init event types in NodeManager's Application state machine. Contributed by Todd Lipcon.
svn merge -c r1185988 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185990 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 06:42:38 +00:00
Vinod Kumar Vavilapalli e3b9d11da8 MAPREDUCE-3144. Augmented JobHistory with the information needed for serving aggregated logs. Contributed by Siddharth Seth.
svn merge -c r1185976 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185977 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 05:28:22 +00:00
Mahadev Konar a9fe990f7b MAPREDUCE-3203. Fix some javac warnings in MRAppMaster. (mahadev) - Merging r1185909 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185910 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 22:48:09 +00:00
Arun Murthy dfb1c18558 Merge -c 1185887 from trunk to branch-0.23 to complete fix for MAPREDUCE-3165.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185888 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:46:15 +00:00
Arun Murthy a990576916 Merge -c 1185880 from trunk to branch-0.23 to complete fix for MAPREDUCE-2762.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185881 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:38:08 +00:00
Arun Murthy 5d639c9048 MAPREDUCE-279. Adding a changelog to branch-0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185489 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 05:31:07 +00:00
Mahadev Konar c1c9ad377e MAPREDUCE-3197. TestMRClientService failing on building clean checkout of branch 0.23 (mahadev) - Merging r1185486 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185487 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 05:13:11 +00:00
Arun Murthy df93e27dd6 Merge -c 1185447 from trunk to branch-0.23 to complete fix for MAPREDUCE-3068.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185448 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 01:23:14 +00:00
Mahadev Konar 203f3e1362 MAPREDUCE-3196. TestLinuxContainerExecutorWithMocks fails on Mac OSX. (Arun Murthy via mahadev) - Merging r1185417 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185419 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 22:44:16 +00:00
Vinod Kumar Vavilapalli 2ce6540fb0 MAPREDUCE-3032. Fixed TaskAttemptImpl so that JobHistory can have error information about failed tasks. Contributed by Devaraj K.
svn merge -c r1185247 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185250 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 15:21:34 +00:00
Arun Murthy 40c2d55de0 MAPREDUCE-3127. Fixed CHANGES.txt to reflect correct jira.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184993 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 04:23:14 +00:00
Arun Murthy 1ae4238dc2 Merge -c 1184989 from trunk to branch-0.23 to complete fix for MAPREDUCE-3101.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184990 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 04:09:35 +00:00
Mahadev Konar 545a030839 MAPREDUCE-3189. Add link decoration back to MR2's CSS. (Todd Lipcon via mahadev) - Merging r1184979 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184980 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:24:41 +00:00
Arun Murthy bcd86749b6 Merge -c 1184977 from trunk to branch-0.23 to fix MAPREDUCE-3136.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184978 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:18:58 +00:00
Arun Murthy 4e236a87e5 Merge -c 1184975 from trunk to branch-0.23 to fix MAPREDUCE-3190.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184976 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:14:55 +00:00
Mahadev Konar e2edc8f20b MAPREDUCE-2840. mr279 TestUberAM.testSleepJob test fails. (jonathan eagles via mahadev) - Merging r1184971 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184972 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 01:24:06 +00:00
Mahadev Konar 065ca399c8 MAPREDUCE-3187. Add names for various unnamed threads in MR2. (Todd Lipcon and Siddharth Seth via mahadev) - Merging r1184904 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184905 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 19:30:13 +00:00
Jitendra Nath Pandey e8caaba2f3 Merged r1183513 from trunk for MAPREDUCE-3192.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183579 13f79535-47bb-0310-9956-ffa450edef68
2011-10-15 01:26:33 +00:00
Jitendra Nath Pandey 0672834f2d Merged r1183187 from trunk for MAPREDUCE-2764.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183576 13f79535-47bb-0310-9956-ffa450edef68
2011-10-15 01:16:34 +00:00
Mahadev Konar 34418d0c91 MAPREDUCE-3057. Job History Server goes of OutOfMemory with 1200 Jobs and Heap Size set to 10 GB. (Eric Payne via mahadev) - Merging r1183545 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183547 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 22:52:05 +00:00
Mahadev Konar 1caff31a74 MAPREDUCE-3059. QueueMetrics do not have metrics for aggregate containers-allocated and aggregate containers-released. (Devaraj K via mahadev) - Merging r1183540 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183542 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 22:42:01 +00:00
Arun Murthy 8876fb033f Merge -c 1183188 from trunk to branch-0.23 to fix MAPREDUCE-3124.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183189 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 01:27:56 +00:00
Arun Murthy ea8f6cf534 Merge -c 1183185 from trunk to branch-0.23 to fix MAPREDUCE-3170.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183186 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 01:17:11 +00:00
Mahadev Konar 66aca6d25d MAPREDUCE-3133. Running a set of methods in a Single Test Class. (Jonathan Eagles via mahadev) - Merging r1182688 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182691 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 07:08:30 +00:00
Arun Murthy c2ae3d6e36 Merge -c 1182616 from trunk to branch-0.23 to fix MAPREDUCE-2789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182617 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:29:53 +00:00
Arun Murthy b57ac1cf61 Merge -c 1182613 from trunk to branch-0.23 to fix MAPREDUCE-2666.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182614 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:12:37 +00:00
Vinod Kumar Vavilapalli a6d54ece55 MAPREDUCE-3125. Modified TaskImpl to consider only non-failed, non-killed task-attempts for obtaining task's progress. Contributed by Hitesh Shah.
svn merge -c r1182230 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182231 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 06:53:14 +00:00
Vinod Kumar Vavilapalli b8a90a2853 MAPREDUCE-3140. Fixed the invalid JobHistory URL for failed applications. Contributed by Subroto Sanyal.
svn merge -c r1182216 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182218 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 06:25:03 +00:00
Arun Murthy 76fb42f94d Merge -c 1182008 from trunk to branch-0.23 to fix MAPREDUCE-3126.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182009 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 18:30:00 +00:00
Arun Murthy 591b080e98 Merge -c 1182000 from trunk to branch-0.23 to fix MAPREDUCE-3126.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182003 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 18:25:07 +00:00
Vinod Kumar Vavilapalli 73b6474bac MAPREDUCE-2668. Fixed AuxServices to send a signal on application-finish to all the services. Contributed by Thomas Graves.
svn merge -c r1181803 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181807 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 14:29:50 +00:00
Vinod Kumar Vavilapalli af72e41ee1 MAPREDUCE-3020. Fixed TaskAttemptImpl to log the correct node-address for a finished Reduce task. (Chackaravarthy via vinodkv)
svn merge -c r1181793 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181794 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 14:12:11 +00:00
Mahadev Konar 343fc18c7b MAPREDUCE-3167. container-executor is not being packaged with the assembly target. (mahadev) - Merging r1181634 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181635 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 07:01:10 +00:00
Vinod Kumar Vavilapalli ddaf7c8a7f MAPREDUCE-3161. svn merge -c r1181622 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181623 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 04:47:28 +00:00
Arun Murthy 8d0daf8843 Merge -c 1181310 from trunk to branch-0.23 to fix MAPREDUCE-3158.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181311 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 00:27:39 +00:00
Vinod Kumar Vavilapalli 446be91d0d MAPREDUCE-2988. svn merge -c r1180833 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180835 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 09:20:49 +00:00
Arun Murthy 590ff92e7a Merge -c 1180774 from trunk to branch-0.23 to fix MAPREDUCE-3154.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180775 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:30:24 +00:00
Arun Murthy 87f567f1dc Merge -c 1180772 from trunk to branch-0.23 to fix MAPREDUCE-3123.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180773 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:27:38 +00:00
Arun Murthy bcc1745434 Merge -c 1180769 from trunk to branch-0.23 to fix MAPREDUCE-3153.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180770 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:11:20 +00:00
Arun Murthy c4c9b7edc7 Merge -c 1180767 from trunk to branch-0.23 to fix MAPREDUCE-2876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180768 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:07:21 +00:00
Konstantin Shvachko 1f55eeabe4 Move MAPREDUCE-3138 changes to Release 0.22 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180753 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 00:45:00 +00:00
Arun Murthy bc8010bd00 Merge -c 1180220 from trunk to branch-0.23 to fix MAPREDUCE-2802.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180222 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 20:45:18 +00:00
Arun Murthy fce52877b1 Merge -c 1180214 from trunk to branch-0.23 to fix MAPREDUCE-3033.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180216 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 20:40:40 +00:00
Vinod Kumar Vavilapalli 7be1d43cdc MAPREDUCE-2751. svn merge -c r1180071 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180073 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 15:26:22 +00:00
Vinod Kumar Vavilapalli 3c053ee51e MAPREDUCE-3141. svn merge -c r1180007 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180008 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 11:36:36 +00:00
Vinod Kumar Vavilapalli b1282883cc MAPREDUCE-2783. svn merge -c r1179975 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179978 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 09:23:42 +00:00
Mahadev Konar 02bc9ecf9b MAPREDUCE-2794. [MR-279] Incorrect metrics value for AvailableGB per queue per user. (John George via mahadev) - Merging r1179936 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179937 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 05:34:51 +00:00
Vinod Kumar Vavilapalli a9f2a60872 MAPREDUCE-2913. svn merge -c r1179319 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179326 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 17:10:38 +00:00
Vinod Kumar Vavilapalli 90674a233a MAPREDUCE-2738. svn merge -c r1179229 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179232 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 14:07:08 +00:00
Vinod Kumar Vavilapalli 763327fd51 MAPREDUCE-2702. svn merge -c r1179188 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179191 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 12:17:46 +00:00
Vinod Kumar Vavilapalli 8ccbd7d135 MAPREDUCE-2907. svn merge -c r1179178 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179181 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:58:41 +00:00
Vinod Kumar Vavilapalli c4148c8db1 MAPREDUCE-3013. svn merge -c r1179174 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:47:00 +00:00
Konstantin Shvachko a9612fa264 Move MAPREDUCE-2531 changes to Release 0.22 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179077 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 07:34:55 +00:00
Vinod Kumar Vavilapalli fd1e8b15d5 MAPREDUCE-3056. svn merge -c r1178740 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178741 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 09:39:50 +00:00
Eric Yang 5d2f0a19aa MAPREDUCE-3112. Fixed recursive sourcing of HADOOP_OPTS environment
variable. (Eric Yang)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178658 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 00:51:29 +00:00
Arun Murthy 4f754bfb15 Merge -r 1178649:1178650 from trunk to branch-0.23 to fix MAPREDUCE-3138.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178651 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 00:43:20 +00:00
Arun Murthy 9efc5089de Merge -r 1178630:1178631 from trunk to branch-0.23 to fix MAPREDUCE-2792.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178633 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 23:23:04 +00:00
Arun Murthy d564b4d799 Merge -r 1178529:1178530 from trunk to branch-0.23 to fix MAPREDUCE-3134.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178531 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 19:36:32 +00:00
Arun Murthy d8da0542dd MAPREDUCE-3137. Fix broken merge of MAPREDUCE-2179. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178524 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 19:25:40 +00:00
Arun Murthy 797671f3fb Merge -r 1177919:1177920 from trunk to branch-0.23 to fix MAPREDUCE-2889.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177921 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 05:24:06 +00:00
Arun Murthy 714d8fbeb2 Merge -r 1177873:1177874 from trunk to branch-0.23 to fix MAPREDUCE-3113.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177875 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 00:00:04 +00:00
Arun Murthy d2bf75aec0 Merge -r 1177863:1177864 from trunk to branch-0.23 to fix MAPREDUCE-2719.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177865 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 22:26:58 +00:00
Arun Murthy 4854989c46 Merge -r 1177858:1177859 from trunk to branch-0.23 to fix MAPREDUCE-3050.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177861 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 22:20:11 +00:00
Konstantin Shvachko 1efe4e403d MAPREDUCE-2779. JobSplitWriter.java can't handle large job.split file. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177783 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 19:16:54 +00:00
Vinod Kumar Vavilapalli 908f1d5d01 MAPREDUCE-3098. svn merge -c r1177633 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177639 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 12:54:53 +00:00
Arun Murthy be51b71dee Merge -r 1177530:1177531 from trunk to branch-0.23 to fix MAPREDUCE-2996.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177532 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 06:49:43 +00:00
Arun Murthy f99d1f7fde Merge -r 1177486:1177487 from trunk to branch-0.23 to fix MAPREDUCE-2791.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177490 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 03:10:57 +00:00
Vinod Kumar Vavilapalli 3513e3d673 MAPERDUCE-3001. svn merge -c r1177203 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177206 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 08:13:15 +00:00
Vinod Kumar Vavilapalli 034d0d8fee MAPREDUCE-3114. svn merge -c r1177187 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177190 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 07:33:36 +00:00
Arun Murthy e6f5bf6dd8 Merge -r 1176761:1176762 from trunk to branch-0.23 to fix MAPREDUCE-3078.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176763 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 07:32:22 +00:00
Vinod Kumar Vavilapalli 456e6e1de6 MAPREDUCE-3110. svn merge -c r1176739 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176740 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 06:04:54 +00:00
Vinod Kumar Vavilapalli c0bcd07330 MAPREDUCE-2843. svn merge -c r1176730 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176731 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 05:37:30 +00:00
Arun Murthy f67abbdbf6 Merge -r 1176714:1176715 from trunk to branch-0.23 to fix MAPREDUCE-3041.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176718 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 04:25:19 +00:00