Commit Graph

961 Commits

Author SHA1 Message Date
Robert Joseph Evans 2353571c64 svn merge -c 1359252 FIXES: MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359253 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 16:15:12 +00:00
Harsh J 9ffc3e7dfd Backport MAPREDUCE-3906 from trunk. svn merge -c 1358896 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358897 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:14:11 +00:00
Harsh J 41553468b1 Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:02:53 +00:00
Harsh J b035a14d58 Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 17:24:38 +00:00
Robert Joseph Evans 2e6f49f4e4 svn merge -c 1358305 FIXES: MAPREDUCE-4379. Node Manager throws java.lang.OutOfMemoryError: Java heap space due to org.apache.hadoop.fs.LocalDirAllocator.contexts (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358308 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 17:20:45 +00:00
Thomas Graves ca23ea7cf5 merge -r 1358200:1358201 from trunk. FIXES: MAPREDUCE-4387
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358203 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 13:39:41 +00:00
Thomas Graves ca78b62579 merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 21:37:53 +00:00
Robert Joseph Evans 93f425a659 svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 18:10:51 +00:00
Alejandro Abdelnur c25a45dc52 Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 16:33:34 +00:00
Eli Collins 2d05f1a749 HADOOP-8463. hadoop.security.auth_to_local needs a key definition and doc. Contributed by Madhukara Phatak
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356514 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 22:48:05 +00:00
Eli Collins 2b938bea99 HADOOP-8538. CMake builds fail on ARM. Contributed by Trevor Robinson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356042 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 22:51:13 +00:00
Harsh J f62de1d81e svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 17:11:46 +00:00
Eli Collins 4a5591ebe1 MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355557 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 21:02:29 +00:00
Robert Joseph Evans b38f46e73c svn merge -c 1355124 FIXES: MAPREDUCE-4376. TestClusterMRNotification times out (Kihwal Lee via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355125 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 19:30:22 +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
Robert Joseph Evans 15e5fb1c34 svn merge -c 1354531 FIXES: MAPREDUCE-4372. Deadlock in Resource Manager (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354533 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 14:29:12 +00:00
Robert Joseph Evans 4bb61ecbd7 svn merge -c 1354181 FIXES: MAPREDUCE-4228. mapreduce.job.reduce.slowstart.completedmaps is not working properly (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354182 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 19:18:49 +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
Alejandro Abdelnur d21c6aa52f Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 21:37:14 +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
Alejandro Abdelnur e519ed959a Merge -r 1353624:1353625 from trunk to branch. FIXES: MAPREDUCE-4336
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353628 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 16:03:25 +00:00
Siddharth Seth 461ef73bf2 Merge MAPREDUCE-4031 from trunk. Prevent a Node Manager hang during shutdown. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353040 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 21:47:12 +00:00
Thomas Graves 22d23a4d0f merge -r 1352637:1352638 from trunk. FIXES: MAPREDUCE-4295
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352639 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 18:15:13 +00:00
Thomas Graves 2d734774a1 merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352551 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:02:16 +00:00
Robert Joseph Evans f63255faec svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 21:32:21 +00:00
Siddharth Seth 3b61e3693f Merge MAPREDUCE-4306 from trunk. Fix distributed shell to work with users other than the one running the daemons. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351878 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 22:02:48 +00:00
Siddharth Seth 27bbcc4c5c Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351870 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 21:54:00 +00:00
Robert Joseph Evans c30a4d6a90 svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351825 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 20:00:35 +00:00
Thomas Graves 234f1a7ab7 merge -r 1351761:1351762 from trunk. FIXES: MAPREDUCE-4341
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351764 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 16:18:08 +00:00
Thomas Graves daf8c54e66 merge -r 1351699:1351700 from trunk. FIXES: MAPREDUCE-4311
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351703 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 13:08:20 +00:00
Uma Maheswara Rao G 0b32101511 Merge r:1349466 HDFS-3389. Document the BKJM usage in Namenode HA. Contributed by Uma Maheswara Rao G and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349469 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:27:01 +00:00
Siddharth Seth 2846979f16 Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +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
Alejandro Abdelnur f27f122609 Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348959 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:44:57 +00:00
Thomas Graves 4159a21d28 merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
Thomas Graves d1607ba557 merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 15:51:21 +00:00
Todd Lipcon d7e171d5b8 Merge HDFS-3042 (automatic failover) to branch-2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347804 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:25:34 +00:00
Tsz-wo Sze 1156fc41dc svn merge -c -1347094 for reverting HADOOP-8368 again.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347739 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 17:58:19 +00:00
Alejandro Abdelnur bad1c8bdd5 svn merge -c -1346495 for re-committing HADOOP-8368. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 20:17:33 +00:00
Vinod Kumar Vavilapalli cb4b43b37e MAPREDUCE-3873. Fixed NodeManagers' decommissioning at RM to accept IP addresses also. Contributed by xieguiming and vinodkv.
svn merge --ignore-ancestry -c 1346671 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346673 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 23:55:46 +00:00
Tsz-wo Sze b93758626e svn revert -c -1346102 for reverting HADOOP-8368.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346495 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 18:00:44 +00:00
Robert Joseph Evans eb7df250ca svn merge -c 1346406. FIXES: MAPREDUCE-4313. TestTokenCache doesn't compile due TokenCache.getDelegationToken compilation error (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346409 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 15:09:56 +00:00
Eli Collins 068b62b9a3 Updated CHANGES.txt files to reflect the 2.0.0-alpha release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346151 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 20:54:17 +00:00
Alejandro Abdelnur 36c8624924 Merge -r 1345420:1345421 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346102 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 19:34:57 +00:00
Thomas Graves ddef6a062e merge -r 1346064:1346065 from trunk. FIXES: MAPREDUCE-3350
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346068 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 18:06:58 +00:00
Thomas Graves 3dc10a25d9 merge -r 1346046:1346047 from trunk. FIXES: MAPREDUCE-3350
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346048 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 17:42:45 +00:00
Thomas Graves c59349ede3 merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 15:15:13 +00:00
Eli Collins 8960db7605 HADOOP-8450. Remove src/test/system. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345795 13f79535-47bb-0310-9956-ffa450edef68
2012-06-03 22:21:06 +00:00
Eli Collins 026a285d52 MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() without a Path - Failure when using ViewFileSystem. Contributed by Ahmed Radwan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345552 13f79535-47bb-0310-9956-ffa450edef68
2012-06-02 18:50:50 +00:00
Robert Joseph Evans 5e8a982209 svn merge -c 1345362. FIXES: MAPREDUCE-4302. NM goes down if error encountered during log aggregation (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345363 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 21:56:04 +00:00
Robert Joseph Evans 0bed0fec3c svn merge -c 1345304. FIXES: HADOOP-8460. Document proper setting of HADOOP_PID_DIR and HADOOP_SECURE_DN_PID_DIR (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345306 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 18:19:02 +00:00
Robert Joseph Evans f376251475 svn merge -c 1344763 FIXES: MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344764 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 15:17:39 +00:00
Robert Joseph Evans ed20ba2e49 svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 14:52:39 +00:00
Harsh J 4200fa906e svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:15:25 +00:00
Thomas White 5e473c9c6e Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:45:25 +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
Thomas Graves 02a703fac2 merge -r 1342243:1342244 from trunk. FIXES: MAPREDUCE-4224
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342245 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 13:17:08 +00:00
Alejandro Abdelnur 897314775b Merge -r 1342074:1342075 from trunk to branch. FIXES: MAPREDUCE-4276
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342076 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 22:23:50 +00:00
Thomas Graves f57e335252 merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341973 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 18:38:23 +00:00
Thomas Graves 0a0c649c86 merge -r 1341159:1341160 from trunk. FIXES: MAPREDUCE-3870
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341162 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:22:49 +00:00
Robert Joseph Evans 1586e827ed i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:07:13 +00:00
Thomas Graves 1c65990dae merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 01:57:21 +00:00
Eli Collins 619cc6a775 HDFS-2885. Remove "federation" from the nameservice config options. Contributed by Tsz Wo (Nicholas), SZE
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340842 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 21:15:16 +00:00
Todd Lipcon 58f72f035f MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not from default file system. Contributed by Bhallamudi Venkata Siva Kamesh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340629 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 07:41:37 +00:00
Thomas Graves 297cbcca27 merge -r 1339956:1339957 from trunk. FIXES: MAPREDUCE-4197
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339958 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 02:51:56 +00:00
Thomas Graves b35de62e1d MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339652 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 15:31:19 +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 Graves a1ce7813e9 merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 14:10:35 +00:00
Todd Lipcon 73766e6d1d Move changes from 2.0.0-alpha to 2.0.1-alpha in CHANGES.txt for those that did not make rc1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339017 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 05:44:01 +00:00
Alejandro Abdelnur e8ea3fdb52 Merge -r 1338999:1339000 from trunk to branch. FIXES: MAPREDUCE-4250
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339002 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 04:16:37 +00:00
Thomas Graves c993d1bac5 merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338841 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:15:43 +00:00
Tsz-wo Sze a5da2f6d68 Merge r1329319 for HADOOP-8285 for the changes outside common.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337433 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 02:19:58 +00:00
Robert Joseph Evans 5922f4f064 svn merge -c 1337363 FIXES: MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337364 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 20:27:58 +00:00
Aaron Myers 35b27ae3f5 HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop. Contributed by Roman Shaposhnik.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337252 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 16:16:55 +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
Tsz-wo Sze b41b4e9c43 svn merge -c 1336909 from trunk for HDFS-3369. Rename {get|set|add}INode(..) methods in BlockManager and BlocksMap to {get|set|add}BlockCollection(..).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336911 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 21:45:45 +00:00
Robert Joseph Evans 00f0379a54 svn merge -c 1336399. FIXES: MAPREDUCE-4237. TestNodeStatusUpdater can fail if localhost has a domain associated with it (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336401 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 21:10:02 +00:00
Tsz-wo Sze 8a99480f44 svn merge -c 1335661 from trunk for MAPREDUCE-4231.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 17:57:07 +00:00
Thomas Graves 9b6535579e merge -r 1335646:1335647 from trunk. FIXES: MAPREDUCE-4215
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335648 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 17:14:43 +00:00
Robert Joseph Evans c35e442b1b svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:26:11 +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
Thomas White f1e31ebaf2 Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 19:07:29 +00:00
Robert Joseph Evans e54add89a8 svn merge -c 1335096 FIXES: MAPREDUCE-4220. RM apps page starttime/endtime sorts are incorrect (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335098 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:19:34 +00:00
Robert Joseph Evans 95a0505c60 svn merge -c 1334043. FIXES: MAPREDUCE-3958. RM: Remove RMNodeState and replace it with NodeState (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334045 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:48:13 +00:00
Robert Joseph Evans 13acee63d3 svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:04:08 +00:00
Alejandro Abdelnur 9a04fc6caf Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:21:15 +00:00
Robert Joseph Evans c9aac0a1d1 svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 18:37:01 +00:00
Alejandro Abdelnur d5defb5e60 Merge -r 1333240:1333241 from trunk to branch. FIXES: MAPREDUCE-4219
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333242 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:54:36 +00:00
Robert Joseph Evans 611dffafc7 svn merge -c 1333144 FIXES: MAPREDUCE-4210. Expose listener address for WebApp (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333145 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 18:28:13 +00:00
Robert Joseph Evans 76cc94f43f svn merge -c 1333063 FIXES: MAPREDUCE-3173. MRV2 UI doesn't work properly without internet (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333066 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 14:44:10 +00:00
Robert Joseph Evans 007878d3e2 MAPREDUCE-4202. Updating changes to just be branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332728 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:13:53 +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
Robert Joseph Evans 848a2026f2 svn merge -c 1332701 FIXES: MAPREDUCE-4211. Error conditions (missing appid, appid not found) are masked in the RM app page (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332703 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 15:36:09 +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
Thomas Graves 41ce1fa860 merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332235 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 15:08:30 +00:00
Robert Joseph Evans f17cf45efe svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332227 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 14:49:43 +00:00
Thomas Graves 0b6d455dc8 merge -r 1332195:1332196 from trunk. FIXES: MAPREDUCE-3883
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332198 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 13:44:12 +00:00
Robert Joseph Evans da0f9645a0 svn merge -c 1331046. FIXES: MAPREDUCE-4189. TestContainerManagerSecurity is failing (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331048 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 19:44:22 +00:00
Thomas White e5e15fab74 Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:48:13 +00:00
Robert Joseph Evans 0f0204c3c2 svn merge -c 1331012. FIXES: MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331014 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:28:18 +00:00
Thomas Graves bb9cfbb052 merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 21:14:13 +00:00
Robert Joseph Evans 7f40acc947 svn merge -c 1330552 FIXES: MAPREDUCE-4194. ConcurrentModificationError in DirectoryCollection (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330555 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 20:53:15 +00:00
Thomas White a7e688c6a8 Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330429 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:22:53 +00:00
Thomas Graves f8f390b83d merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:07:22 +00:00
Alejandro Abdelnur 37026cea83 Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:51 +00:00
Robert Joseph Evans 88d736ce2b svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:46:16 +00:00
Robert Joseph Evans 1fca6cfe03 svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:39:43 +00:00
Robert Joseph Evans 1ea39ddc3c svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 15:28:19 +00:00
Robert Joseph Evans 0c244e8703 svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:36:47 +00:00
Alejandro Abdelnur 479e5b0102 Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:34:49 +00:00
Robert Joseph Evans 8f4c3499f5 svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:24:45 +00:00
Robert Joseph Evans e439d3bb39 MAPREDUCE-4093. Improve RM WebApp start up when proxy address is not set (Devaraj K vai bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328091 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:44:55 +00:00
Robert Joseph Evans eec2fd9f74 MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:33:04 +00:00
Robert Joseph Evans a18ad09c94 svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:23:35 +00:00
Thomas Graves 7221ae82e5 merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 14:54:03 +00:00
Robert Joseph Evans 461b330ebf svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
Siddharth Seth be7e487ef3 Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 02:01:02 +00:00
Robert Joseph Evans 45b2835e9f svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 22:13:52 +00:00
Thomas Graves 1769fd46e2 merge -r 1327262:1327263 from trunk. FIXES: MAPREDUCE-4151
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327265 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 20:06:49 +00:00
Thomas Graves 7fec5b7d94 merge -r 1327232:1327233 from trunk. FIXES: MAPREDUCE-4160
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327234 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:23:01 +00:00
Siddharth Seth ab8ea1db58 Merge MAPREDUCE-3942 from trunk. Randomize master key generation for ApplicationTokenSecretManager and roll it every so often. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327221 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 18:55:53 +00:00
Thomas Graves 27cdd16a50 merge -r 1326794:1326795 from trunk. FIXES: MAPREDUCE-4156
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326796 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 20:47:44 +00:00
Thomas Graves e1aa56712c merge -r 1326706:1326707 from trunk. FIXES: MAPREDUCE-4008
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326709 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 18:04:25 +00:00
Siddharth Seth 68f136337d Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:26:07 +00:00
Robert Joseph Evans 8ca897dea2 svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
Thomas White f537469c7e Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 00:11:53 +00:00
Siddharth Seth d550503dbb Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:41:09 +00:00
Thomas White cb3d6c3d98 Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:31:15 +00:00
Thomas Graves d31abfe3f8 merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 21:14:55 +00:00
Siddharth Seth 462f9a5249 MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
Siddharth Seth 50c13a44af merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +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 15d3d52f1b merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:10:34 +00:00
Robert Joseph Evans 3cf79f4c7e svn merge -c 1312003 from trunk. FIXES: MAPREDUCE-4076. Stream job fails with ZipException when use yarn jar command (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312004 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 21:31:41 +00:00
Robert Joseph Evans b04f23fc96 svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:37:13 +00:00
Tsz-wo Sze b46380e463 svn merge -c 1311959 from trunk for MAPREDUCE-4057.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311960 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:50:09 +00:00
Robert Joseph Evans 07321a677c svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:59:03 +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
Robert Joseph Evans a2c86e8e3d MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311823 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 16:14:59 +00:00
Siddharth Seth 5f535af454 Merge MAPREDUCE-3869 from trunk. Fix classpath for DistributedShell application. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311524 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:02:57 +00:00
Thomas White de5069a6a1 Merge -r 1311519:1311520 from trunk to branch-2. Fixes MAPREDUCE-4105.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311521 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 23:35:21 +00:00
Robert Joseph Evans f9e39d057e svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 21:54:22 +00:00
Robert Joseph Evans ea165d6e91 svn merge -c 1310546 FIXES: MAPREDUCE-4110. Fix tests in TestMiniMRClasspath & TestMiniMRWithDFSWithDistinctUsers (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310547 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:57:44 +00:00
Arun Murthy 9562831e74 Added toString to ContainerToken. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310538 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:41:51 +00:00
Robert Joseph Evans 34ed535299 svn merge -c 1310528 from trunk. FIXES: MAPREDUCE-4051. Remove the empty hadoop-mapreduce-project/assembly/all.xml file (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310529 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:10:11 +00:00
Robert Joseph Evans 6514ecce13 svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:05:36 +00:00
Robert Joseph Evans cbbddcb3ca svn merge -c 1310418 from trunk. FIXES: MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310421 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:58:36 +00:00
Robert Joseph Evans 7c087c4a9b svn merge -c 1310409 from trunk. FIXES: MAPREDUCE-4113. Fix tests org.apache.hadoop.mapred.TestClusterMRNotification (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310412 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:51:07 +00:00
Robert Joseph Evans 401d4b3584 svn merge -c 1310056 from trunk. FIXES: MAPREDUCE-4073. CS assigns multiple off-switch containers when using multi-level-queues (Siddharth Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310057 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:29:01 +00:00
Thomas Graves 0d388cd1f4 merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:13:11 +00:00