Commit Graph

174 Commits

Author SHA1 Message Date
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
Vinod Kumar Vavilapalli 76d72db5eb YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:57:10 +00:00
Vinod Kumar Vavilapalli 523e98d914 MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1463828 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463829 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:40:21 +00:00
Thomas White b1c781b2be MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 11:42:32 +00:00
Alejandro Abdelnur 7f9b4c4e8b MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446043 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:22:41 +00:00
Alejandro Abdelnur 1709c222d9 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:36:47 +00:00
Alejandro Abdelnur a6925b3fdd MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445331 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 20:16:43 +00:00
Arun Murthy 196341fc09 Setting version to 2.0.4-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:23:45 +00:00
Siddharth Seth 6f146b15d3 merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 00:23:27 +00:00
Siddharth Seth 44b3be14bc merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 18:35:10 +00:00
Suresh Srinivas 1b410df23f MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:13:43 +00:00
Thomas Graves fdc4c61101 MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:35 +00:00
Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 16:22:55 +00:00
Thomas White 75878f6c7b Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 16:31:58 +00:00
Vinod Kumar Vavilapalli 9a87b2f7fe MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.
svn merge --ignore-ancestry -c 1429751 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 11:15:10 +00:00
Robert Joseph Evans 199df2b770 svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:38:36 +00:00
Thomas Graves 2cb090a075 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:31:22 +00:00
Robert Joseph Evans 6862511182 svn merge -c 1428482 FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 17:21:27 +00:00
Alejandro Abdelnur 1fce56fd24 MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 19:50:32 +00:00
Thomas White db8545d924 Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 15:16:57 +00:00
Eli Collins 3bc91c97cb MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409603 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 00:17:17 +00:00
Jason Darrell Lowe 43159cc20d svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 19:58:01 +00:00
Vinod Kumar Vavilapalli 5944b1c703 MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1399976 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:59:25 +00:00
Thomas Graves e5e1887092 merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 15:25:05 +00:00
Vinod Kumar Vavilapalli a5e50dfae9 MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1383709 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:59:59 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Robert Joseph Evans ebb1a16f62 svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 16:47:04 +00:00
Arun Murthy b9a3f51dcd Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 04:59:20 +00:00
Robert Joseph Evans 2616974383 svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:22:04 +00:00
Siddharth Seth a1c556ca19 merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 00:41:03 +00:00
Alejandro Abdelnur d7a90bc552 MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 21:23:09 +00:00
Arun Murthy 92a99de731 Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:33:56 +00:00
Jonathan Turner Eagles 054dd2d39c svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 20:42:18 +00:00
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
Vinod Kumar Vavilapalli 65e6abb477 MAPREDUCE-3511. Removed a multitude of cloned/duplicate counters in the AM thereby reducing the AM heap size and preventing full GCs. (vinodkv)
svn merge -c 1229347 trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229350 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 21:07:25 +00:00
Arun Murthy 907e861241 Merge -c 1220996 from trunk to branch-0.23 to fix MAPREDUCE-3563.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220997 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 23:08:19 +00:00
Vinod Kumar Vavilapalli 88fe1ae2ed MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah.
svn merge -c 1213987 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213989 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:42:50 +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
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
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
Mahadev Konar de8f0efe60 MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev) - Merging r1208131 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208135 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:28:16 +00:00
Arun Murthy fbfe1b0afa Changing branch-0.23 to 0.23.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 23:47:40 +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
Thomas White 92fd345d14 Merge -r 1195816:1195817 from trunk to branch-0.23. Fixes: HADOOP-7782.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195821 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:53:00 +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
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
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 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
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
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