Commit Graph

130 Commits

Author SHA1 Message Date
Steve Loughran a7bfe3efe3 MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541699 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:43:04 +00:00
Jason Darrell Lowe 55a9d7dc50 svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541583 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 16:19:21 +00:00
Luke Lu 9b1122e0eb YARN-311. RM/scheduler support for dynamic resource configuration. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539132 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 21:20:05 +00:00
Colin McCabe 5324b77a60 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
Sanford Ryza ba85796267 YARN-786. Expose application resource usage in RM REST API (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537811 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 03:03:24 +00:00
Sanford Ryza 6902aea705 YARN-1306. Clean up hadoop-sls sample-conf according to YARN-1228 (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536990 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 06:57:41 +00:00
Arpit Agarwal 57bdb564c7 HDFS-5436. Merging change r1536921 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536922 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:50:24 +00:00
Jonathan Turner Eagles 16cc6640b7 HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535088 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 18:12:02 +00:00
Sanford Ryza 5c20de6ac3 MAPREDUCE-5457. Add a KeyOnlyTextOutputReader to enable streaming to write out text files without separators (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533626 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 20:46:05 +00:00
Suresh Srinivas bc18c6f842 HADOOP-10005. Merge 1532907 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:05:23 +00:00
Jonathan Turner Eagles f35f88b1cf MAPREDUCE-5586. TestCopyMapper#testCopyFailOnBlockSizeDifference fails when run from hadoop-tools/hadoop-distcp directory (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:28:13 +00:00
Jonathan Turner Eagles 85b5e96f10 MAPREDUCE-5585. TestCopyCommitter#testNoCommitAction Fails on JDK7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532878 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:06:53 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Sanford Ryza f3e4452e31 YARN-1300. SLS tests fail because conf puts YARN properties in fair-scheduler.xml (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:28:41 +00:00
Jonathan Turner Eagles 8a93fa55b6 YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529008 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:18 +00:00
Vinod Kumar Vavilapalli 579cf8f612 YARN-899. Added back queue level administrator-acls so that there is no regression w.r.t 1.x. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1527282 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527283 13f79535-47bb-0310-9956-ffa450edef68
2013-09-29 08:22:14 +00:00
Steve Loughran f5ecb84344 HADOOP-8545 findbugs patches from the final -037 patch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527188 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:57:27 +00:00
Steve Loughran 905be853a1 HADOOP-10006. Compilation failure in trunk for o.a.h.fs.swift.util.JSONUtil
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:30:09 +00:00
Alejandro Abdelnur 75f9db1c4d YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
Arun Murthy b063da7b50 HADOOP-8545. Fixed merge to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527052 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:54:55 +00:00
Steve Loughran d44334158a HADOOP-8545. Filesystem Implementation for OpenStack Swift
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526848 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:12:42 +00:00
Jason Darrell Lowe 4cd5cb862c svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509901 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 22:53:52 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
Kihwal Lee 727acb377e svn merge -c 1503976 merging to branch-2 to fix HADOOP-9738. TestDistCh fails. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503977 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 02:24:18 +00:00
Chris Nauroth bc4c8b12a6 HADOOP-9656. Merging change r1496597 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496600 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 19:26:48 +00:00
Daryn Sharp 45ca24c1d8 svn merge -c 1491914 FIXES: MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491918 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 19:30:44 +00:00
Luke Lu d77a2579f2 HADOOP-9616. Fix branch-2 javadoc warnings. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489951 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 16:49:04 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:34:52 +00:00
Jason Darrell Lowe eb7af141e4 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489250 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:29:37 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 02:36:44 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:41 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
Suresh Srinivas 91084635f3 MAPREDUCE-4885. Merge r1467158 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 07:12:07 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
Alejandro Abdelnur c56c50df3f MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480754 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 20:11:33 +00:00
Kihwal Lee 88086534a8 svn merge -c 1468629 Merging from trunk to branch-2 to fix MR-5065.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468631 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 22:03:40 +00:00
Alejandro Abdelnur 5b63830211 MAPREDUCE-5098. Fix findbugs warnings in gridmix. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466872 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 13:08:55 +00:00
Alejandro Abdelnur a7d2d7cfc7 MAPREDUCE-5113. Streaming input/output types are ignored with java mapper/reducer. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466870 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 13:04:29 +00:00
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
Arun Murthy b66abebca2 Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465189 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 05:33:41 +00:00
Thomas Graves e9e576409c MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463808 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 01:47:31 +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
Thomas Graves 0f66ba0b50 MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and sortFinished times when needed. (Ravi Gummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461296 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 20:10:04 +00:00
Thomas Graves 257b263802 MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter strings. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461289 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:54:51 +00:00
Thomas Graves 922c8ff997 MAPREDUCE-4356. [Rumen] Provide access to the method ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461277 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:26:36 +00:00
Thomas Graves 291a20960b MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for map only jobs. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461275 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:21:43 +00:00
Thomas Graves 8f43934e99 MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461272 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:08:26 +00:00
Thomas Graves e9440d688e MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running tasks in Gridmix. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461269 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:00:53 +00:00
Siddharth Seth 6e9e2f0c7f MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:18:44 +00:00