Commit Graph

32 Commits

Author SHA1 Message Date
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
Arun Murthy 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
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
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
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
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
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
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
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
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
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
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
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 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
Thomas Graves 57f91f9541 MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow in some cases (ravigummadi via tgraves).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461243 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:00:30 +00:00
Thomas Graves 288393399a MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a job if the trace contains null taskStatus for a task. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461242 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:52:40 +00:00
Thomas Graves 67b93ebb23 MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead counter is wrong when compressed input is used.(ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461236 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:42:29 +00:00
Thomas Graves 1f988b777c MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when input data directory already exists and -generate opton is erate opton is
+    given.(ravi

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461233 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:29:26 +00:00
Thomas Graves 9a217a56dc MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for faster job submission. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461212 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:35:58 +00:00
Thomas Graves 603eff7e8b HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken. (Andrew Wang via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461205 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:27:25 +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
Thomas Graves 38750e6500 MAPREDUCE-4895 Fix compilation failure of org.apache.hadoop.mapred.gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424501 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 14:52:24 +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
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 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
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 8f1f57b37e HADOOP-8329. Build fails with Java 7. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340269 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:45:42 +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