Commit Graph

6245 Commits

Author SHA1 Message Date
Haohui Mai 86f1b41d28 HDFS-6270. Merge r1590197 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590198 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 23:50:48 +00:00
Jason Darrell Lowe 2a76cade32 svn merge -c 1590168 FIXES: MAPREDUCE-5835. Killing Task might cause the job to go to ERROR state. Contributed by Ming Ma
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590174 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 22:34:44 +00:00
Sanford Ryza 44d9ee78e9 YARN-483. Improve documentation on log aggregation in yarn-default.xml (Akira Ajisaka via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590151 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 21:14:25 +00:00
Jonathan Turner Eagles e0cd544a53 MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590131 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 20:32:09 +00:00
Haohui Mai 72f8755cca HDFS-5685. Merge r1590100 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590104 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 19:02:34 +00:00
Jason Darrell Lowe aa3d6ed6ea svn merge -c 1590046 FIXES: MAPREDUCE-5749. TestRMContainerAllocator#testReportedAppProgress Failed. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590047 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 14:56:35 +00:00
Haohui Mai 038f32f74e HDFS-6210. Merge r1589933 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589934 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 05:56:51 +00:00
Arpit Agarwal 774b782596 HADOOP-10540: Merging r1589923 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589924 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 03:10:31 +00:00
Jing Zhao e91f6f809b HDFS-6266. Merge r1589920 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589921 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 02:07:25 +00:00
Aaron Myers 0bf1e43ac3 HDFS-6281. Provide option to use the NFS Gateway without having to use the Hadoop portmapper. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589915 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 00:19:34 +00:00
Colin McCabe 0e2a0fb434 HDFS-6282. Re-add testIncludeByRegistrationName (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589908 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 23:09:04 +00:00
Jing Zhao fa6c972283 HADOOP-10535. Merge r1589905 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589906 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 23:05:25 +00:00
Haohui Mai 1566fff15f MAPREDUCE-5837. Merge r1589903 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589904 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 22:55:25 +00:00
Chris Nauroth 91aad1c7bd HADOOP-10539. Merging change r1589884 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589885 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 21:26:09 +00:00
Jason Darrell Lowe fa9fea80e2 svn merge -c 1589859 FIXES: YARN-1975. Used resources shows escaped html in CapacityScheduler and FairScheduler page. Contributed by Mit Desai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589860 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 20:06:44 +00:00
Arpit Agarwal 1f7b6d319b HDFS-6273: Merging r1589808 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589809 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 18:05:06 +00:00
Arpit Agarwal 6ec6fde017 HDFS-6273: Merging r1589803 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589805 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 17:41:05 +00:00
Jing Zhao a9ab3fe0f6 HDFS-5693. Merge r1589620 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589621 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 07:26:35 +00:00
Haohui Mai d49ff92928 HDFS-6279. Merge r1589618 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589619 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 07:20:46 +00:00
Haohui Mai 4ef2598d5d HDFS-6278. Merge r1589613 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589616 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 07:17:17 +00:00
Ravi Prakash 10510bf324 MAPREDUCE-5846. Rumen doesn't understand JobQueueChangedEvent (Nathan Roberts via raviprak)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589597 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 06:05:31 +00:00
Suresh Srinivas 32e76decb5 HDFS-6276. Merge r1589586 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589588 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 05:08:14 +00:00
Vinod Kumar Vavilapalli b04bb049d2 MAPREDUCE-5843. Fixed TestMRKeyValueTextInputFormat to not leak files and thus avoid failing on Windows. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1589533 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589534 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 22:54:55 +00:00
Andrew Wang 69a90ff22f HADOOP-10531. hadoop-config.sh - bug in --hosts argument. Contributed by Sebastien Barrier.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589531 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 22:37:24 +00:00
Kihwal Lee 8bcb8dba51 svn merge -c 1589528 merging from trunk to branch-2 to fix:HDFS-6217. Webhdfs PUT operations may not work via a http proxy. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589529 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 22:08:19 +00:00
Jason Darrell Lowe c02ab95ee6 svn merge -c 1589524 FIXES: MAPREDUCE-5841. uber job doesn't terminate on getting mapred job kill. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589526 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 21:57:55 +00:00
Suresh Srinivas 488a4086ae HDFS-6275. Merge r1589510 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589511 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 20:21:59 +00:00
Suresh Srinivas a27fda9c85 HDFS-6274. Merge r1589506 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589507 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 20:16:16 +00:00
Uma Maheswara Rao G cdfb1aedd9 Merge HADOOP-10251. Both NameNodes could be in STANDBY State if SNN network is unstable. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589495 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 19:04:33 +00:00
Andrew Wang db667639eb HDFS-5213. TestDataNodeConfig failing on Jenkins runs due to DN web port in use. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589477 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 18:09:34 +00:00
Kihwal Lee f4bba31c92 svn merge -c 1589405 merging from trunk to branch-2 to fix:HADOOP-10527. Fix incorrect return code and allow more retries on EINTR.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589407 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 13:28:55 +00:00
Vinod Kumar Vavilapalli c5450fd0fe MAPREDUCE-5832. Fixed TestJobClient to not fail on JDK7 or on Windows. Contributed by Jian He and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1589315 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589316 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 00:02:46 +00:00
Chris Nauroth 8296b7e3cc HADOOP-10503. Merging change r1589273 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589275 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 19:58:02 +00:00
Chris Nauroth 2d8f62f5c1 MAPREDUCE-5833. TestRMContainerAllocator fails ocassionally. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589259 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 19:32:17 +00:00
Chris Nauroth babe6545d4 MAPREDUCE-5827. Merging change r1589238 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589241 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 18:25:02 +00:00
Chris Nauroth d87463514a MAPREDUCE-5827. Merging change r1589223 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589236 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 18:22:26 +00:00
Chris Nauroth f0d3664d83 MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589007 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:49:28 +00:00
Chris Nauroth de1f0bf3e4 YARN-1970. Merging change r1589001 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589004 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:39:16 +00:00
Jing Zhao a6e2b23b9d HDFS-6178. Merge r1589002 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589003 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:37:58 +00:00
Chris Nauroth f3a6e7023b HDFS-6265. Merging change r1588995 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588998 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 22:55:42 +00:00
Kihwal Lee f01067d685 svn merge -c 1588970 merging from trunk to branch-2 to fix:HADOOP-10526. Chance for Stream leakage in CompressorStream. Contributed by Rushabh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588971 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 19:21:46 +00:00
Kihwal Lee 8ccf18cee7 svn merge -c 1588949 merging from trunk to branch-2 to fix:HADOOP-10522. JniBasedUnixGroupMapping mishandles errors. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588950 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 18:28:53 +00:00
Suresh Srinivas 44b3357c55 HADOOP-9919. Merge r1588943 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588944 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 18:00:08 +00:00
Arpit Agarwal ba0c72d010 HDFS-6245: Merging r1588842 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588843 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 00:16:20 +00:00
Ivan Mitic 2fb649a668 YARN-1865 Merging change r1588693 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588696 13f79535-47bb-0310-9956-ffa450edef68
2014-04-19 19:00:42 +00:00
Chris Nauroth a7a7a16673 MAPREDUCE-5642. Merging change r1588605 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588606 13f79535-47bb-0310-9956-ffa450edef68
2014-04-19 04:21:01 +00:00
Jason Darrell Lowe 1b0ed842d0 svn merge -c 1588572 FIXES: YARN-1932. Javascript injection on the job status page. Contributed by Mit Desai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588573 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 21:46:14 +00:00
Jason Darrell Lowe c8d5d1f82a svn merge -c 1588559 FIXES: MAPREDUCE-4937. MR AM handles an oversized split metainfo file poorly. Contributed by Eric Payne
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588561 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 20:40:00 +00:00
Jason Darrell Lowe ccec38b801 svn merge -c 1588546 FIXES: YARN-1940. deleteAsUser() terminates early without deleting more files on error. Contributed by Rushabh S Shah
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588549 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 19:36:18 +00:00
Haohui Mai 8d12e9bf81 HDFS-6256. Merge r1588524 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588526 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 17:37:26 +00:00