Commit Graph

91 Commits

Author SHA1 Message Date
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:21:27 +00:00
Thomas Graves a1a7ee23f7 merge -r 1367580:1367581 from trunk. FIXES: MAPREDUCE-4456
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367585 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 14:49:07 +00:00
Alejandro Abdelnur bd359a1a8e Merge -r 1362750:1362751 from trunk to branch. FIXES: MAPREDUCE-4406
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362752 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 03:37:38 +00:00
Alejandro Abdelnur c22cddbad1 Merge -r 1362721:1362722 from trunk to branch. FIXES: MAPREDUCE-4422
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362723 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 23:34:38 +00:00
Robert Joseph Evans 796272a502 svn merge -c 1362495 FIXES: MAPREDUCE-4449. Incorrect MR_HISTORY_STORAGE property name in JHAdminConfig (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362496 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:51:52 +00:00
Arun Murthy 4902c6bdc9 Merge -c 1361813 from trunk to branch-2 to fix MAPREDUCE-4427. Added an 'unmanaged' mode for AMs so as to ease development of new applications. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361815 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 21:47:53 +00:00
Alejandro Abdelnur 0b4c8a5875 Reverting MAPREDUCE-4346
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 18:33:38 +00:00
Alejandro Abdelnur df2f723a75 Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 22:01:01 +00:00
Siddharth Seth 09ac40f800 Merge MAPREDUCE-4290 from trunk. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353685 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:56:11 +00:00
Thomas White f323ea705d Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:39:13 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Thomas White dc576b9fa1 Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:04:24 +00:00
Robert Joseph Evans 4bc2774d79 svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:10:03 +00:00
Robert Joseph Evans 5765eb1868 svn merge -c 1332716. FIXES: MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332719 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:02:31 +00:00
Thomas Graves 1a17df6b21 merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 14:11:31 +00:00
Siddharth Seth 40497a9d04 merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 02:52:13 +00:00
Thomas Graves ce9bdceac7 merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:13:09 +00:00
Alejandro Abdelnur 4bdf14f6c9 Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:57:41 +00:00
Siddharth Seth 55639bea52 Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 02:04:21 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Harsh J 92f06cb446 svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 13:31:08 +00:00
Siddharth Seth 3e3e6770ca merge MAPREDUCE-3896 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296402 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 19:29:14 +00:00
Vinod Kumar Vavilapalli 5240af9d20 MAPREDUCE-3901. Modified JobHistory records in YARN to lazily load job and task reports so as to improve UI response times. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1294417 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294421 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 00:35:12 +00:00
Tsz-wo Sze def75f7560 Merge r1293501 through r1293896 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 17:58:14 +00:00
Vinod Kumar Vavilapalli 2b28bb962a MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1293517 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 02:07:19 +00:00
Arun Murthy c79ae7a8db Moving branch-0.23 to version 0.23.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:58:06 +00:00
Tsz-wo Sze 024c23c95f Merge r1291972 through r1293033 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293035 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 23:52:26 +00:00
Alejandro Abdelnur b512e9f282 Merge -r 1292423:1292424 from trunk to branch. FIXES: MAPREDUCE-3884
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292427 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 18:03:27 +00:00
Tsz-wo Sze bd3c2b26ec Merge r1244222 through r1245749 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1245750 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 20:43:55 +00:00
Alejandro Abdelnur 9ea26a7b08 Merge -r 1244263:1244264 from trunk to branch. FIXES: MAPREDUCE-3736
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244265 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:10:40 +00:00
Tsz-wo Sze fd0b6a9596 Merge r1242606 through r1244221 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1244226 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:49:02 +00:00
Vinod Kumar Vavilapalli 6eadd0201d MAPREDUCE-3846. Addressed MR AM hanging issues during AM restart and then the recovery. (vinodkv)
svn merge --ignore-ancestry -c 1243752 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243755 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 00:11:54 +00:00
Tsz-wo Sze 6c0178e7e5 Merge r1241554 through r1242605 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1242642 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 03:04:05 +00:00
Arun Murthy 78971a4267 Set version to 0.23.2-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 08:12:18 +00:00
Siddharth Seth d60facd919 merge MAPREDUCE-3436 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241621 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 20:56:15 +00:00
Tsz-wo Sze fe9369fb3c Merge r1237584 through r1239397 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1239398 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:24:15 +00:00
Mahadev Konar 4c38e6aa9b MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev) - Merging r1239310 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239312 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 20:45:33 +00:00
Tsz-wo Sze 359c746ca7 Merge r1234388 through r1236385 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1236395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 21:37:26 +00:00
Alejandro Abdelnur 1a1474885b Merge -r 1235390:1235391 from trunk to branch. FIXES: MAPREDUCE-3505
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235397 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 18:26:17 +00:00
Tsz-wo Sze 6e8fe7af37 Merge r1233741 through r1234387 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1234406 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 19:50:30 +00:00
Mahadev Konar 6f27abfe72 MAPREDUCE-3698. Client cannot talk to the history server in secure mode. (mahadev) - Merging r1234120 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234125 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 20:47:02 +00:00
Tsz-wo Sze f2a3dccbd8 Merge r1232271 through r1233740 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1233742 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 03:14:44 +00:00
Thomas White 76ef392a2e Merge -r 1232980:1232981 from trunk to branch-0.23. Fixes: MAPREDUCE-3684
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232982 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 18:21:45 +00:00
Arun Murthy 5f2f884a34 Merge -c 1232580 from trunk to branch-0.23 to fix MAPREDUCE-3669. Allow clients to talk to MR HistoryServer using both delegation tokens and kerberos.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232581 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:27:42 +00:00
Tsz-wo Sze e4e47a7519 Merge r1227776 through r1231827 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1231834 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 04:24:24 +00:00
Tsz-wo Sze 228ee31512 svn merge -c 1214106 from trunk for MAPREDUCE-3545 to delete the empty files.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230884 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:38:30 +00:00
Tsz-wo Sze 66f4e8b694 svn merge -c 1214066 from trunk for MAPREDUCE-3545.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230880 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:26:08 +00:00
Mahadev Konar 5b330e9119 MAPREDUCE-3380. Token infrastructure for running clients which are not kerberos authenticated. (mahadev) - Merging r1229855 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229856 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 01:56:34 +00:00
Siddharth Seth 16288c5a7c merge MAPREDUCE-3616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 22:21:42 +00:00