Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,487 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

409 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 2f7c04f53a MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1480394 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480396 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 18:29:10 +00:00
Thomas White 0411165008 Merge -r 1478421:1478422 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478424 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 16:00:15 +00:00
Vinod Kumar Vavilapalli 868362c9b1 MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1477889 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477890 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-01 00:44:13 +00:00
Arun Murthy 1fb58d2322 Merge -c 1471556 from trunk to branch-2 to fix MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471557 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 17:39:28 +00:00
Robert Joseph Evans 8b23e7e10c svn merge -c 1471424 FIXES: MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471429 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 14:23:00 +00:00
Vinod Kumar Vavilapalli 2dfecb78e5 YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong. 
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:01:08 +00:00
Arun Murthy b65a090174 Merge -c 1470216 from trunk to branch-2 to fix MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470217 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 19:19:16 +00:00
Alejandro Abdelnur d516caf788 MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with Hadoop 1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469589 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 21:43:59 +00:00
Alejandro Abdelnur df24059512 MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469524 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 18:53:36 +00:00
Alejandro Abdelnur 9b4f1a0c10 MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server configs. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469096 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 23:15:22 +00:00
Thomas Graves fd6956c3bd MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468484 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 16:12:25 +00:00
Robert Joseph Evans a7fba8fcd7 svn merge -c 1468232 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468235 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-15 21:36:31 +00:00
Vinod Kumar Vavilapalli 0c54bb343d MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth. 
svn merge --ignore-ancestry -c 1467124 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467126 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 22:55:52 +00:00
Siddharth Seth 422133edf7 merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 05:02:45 +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
Konstantin Boudnik 347d9f6b98 MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464147 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-03 18:35:31 +00:00
Robert Joseph Evans ca4b6ee8c6 Reverted MAPREDUCE-4974 because of test failures. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463360 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:15:08 +00:00
Robert Joseph Evans f47bdbded7 svn merge -c 1463221 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463222 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 17:47:19 +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
Robert Joseph Evans 4bc46b766d svn merge -c 1461146 FIXES: MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461149 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 14:17:59 +00:00
Vinod Kumar Vavilapalli 7410551629 MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1460923 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 22:34:45 +00:00
Alejandro Abdelnur 35bc29813f Reverting MAPREDUCE-5028 (commit 1457919) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458438 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 18:00:38 +00:00
Jonathan Turner Eagles 3fdeec0bd3 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458351 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 15:48:36 +00:00
Alejandro Abdelnur 1036f637cc MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457919 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-18 18:59:22 +00:00
Robert Joseph Evans 9a9d40200f svn merge -c 1457119 FIXES: MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457121 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-15 21:11:45 +00:00
Jason Darrell Lowe 77e23898f1 svn merge -c 1455740 FIXES: MAPREDUCE-5060. Fetch failures that time out only count against the first map task. Contributed by Robert Joseph Evans 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455742 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 22:56:57 +00:00
Arun Murthy 851a425b2a Merge -c 1453365 from trunk to branch-2 to fix MAPREDUCE-3685. Fix bugs in MergeManager to ensure compression codec is appropriately used and that on-disk segments are correctly sorted on file-size. Contributed by Anty Rao and Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453367 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 15:03:29 +00:00
Jonathan Turner Eagles ea7aa7f80f MAPREDUCE-5027. Shuffle does not limit number of outstanding connections (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453099 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 00:07:25 +00:00
Alejandro Abdelnur 9db8505b19 HADOOP-9349. Confusing output when running hadoop version from one hadoop installation when HADOOP_HOME points to another. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451449 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-01 01:21:30 +00:00
Jonathan Turner Eagles 07680cdb13 MAPREDUCE-4871. AM uses mapreduce.jobtracker.split.metainfo.maxsize but mapred-default has mapreduce.job.split.metainfo.maxsize (Jason Lowe via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451319 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-28 19:57:10 +00:00
Siddharth Seth b775d49f35 merge MAPREDUCE-4693 from trunk. Historyserver should include counters for failed tasks. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450957 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 21:04:29 +00:00
Vinod Kumar Vavilapalli c3981d3f2c MAPREDUCE-4892. Modify CombineFileInputFormat to not skew input slits' allocation on small clusters. Contributed by Bikas Saha. 
svn merge --ignore-ancestry -c 1450912 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450915 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 18:53:03 +00:00
Thomas White 7b943682fb Merge -r 1450722:1450723 from trunk to branch-2. Fixes: MAPREDUCE-5008. Merger progress miscounts with respect to EOF_MARKER. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450724 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 10:40:52 +00:00
Thomas White a9f552cb33 Merge -r 1448601:1448602 from trunk to branch-2. Fixes: MAPREDUCE-5013. mapred.JobStatus compatibility: MR2 missing constructors from MR1. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448604 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 11:44:50 +00:00
Thomas White af07edf1ab Merge -r 1448596:1448597 from trunk to branch-2. Fixes: MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected in MR2. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448598 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 11:36:26 +00:00
Jason Darrell Lowe e3924c623f svn merge -c 1445456 FIXES: MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445457 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 02:17:24 +00:00
Jason Darrell Lowe 2db13d61c2 svn merge -c 1443257 FIXES: MAPREDUCE-4822. Unnecessary conversions in History Events. Contributed by Chu Tong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443269 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 22:58:09 +00:00
Alejandro Abdelnur f5503bd44a MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 19:53:06 +00:00
Robert Joseph Evans dcbad333ad svn merge -c 1443027. FIXES: MAPREDUCE-4905. test org.apache.hadoop.mapred.pipes (Aleksey Gorshkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443033 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 15:57:46 +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 392a96bd64 merge MAPREDUCE-4971 from trunk. Minor extensibility enhancements to Counters & FileOutputFormat. Contributed by Arun C Murthy 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441672 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 00:49:17 +00:00
Alejandro Abdelnur 1cc2fcd3b2 MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440080 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 19:40:20 +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
Alejandro Abdelnur 26e597010f Reverting MAPREDUCE-2264 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-28 18:59:32 +00:00
Alejandro Abdelnur 7ac9d3b1c5 MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438800 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:50:17 +00:00
Alejandro Abdelnur d8cdee8360 MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438796 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:41:12 +00:00
Alejandro Abdelnur cf67cccd7c MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438795 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:40:21 +00:00
Alejandro Abdelnur 7a6b9f3609 MAPREDUCE-4809. Change visibility of classes for pluggable sort changes. (masokan via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438794 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:39:27 +00:00
Alejandro Abdelnur c4c039bb29 MAPREDUCE-4049. Experimental api to allow for alternate shuffle plugins. Contributed by Anver BenHanoch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438793 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:38:38 +00:00
Jonathan Turner Eagles 361e05864f svn merge -c 1435386 FIXES: MAPREDUCE-4458. Warn if java.library.path is used for AM or Task (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435394 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 22:47:14 +00:00
Alejandro Abdelnur 1d6bd54e29 MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434994 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 00:41:26 +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
Robert Joseph Evans 63106e20e0 svn merge -c 1432230 FIXES: MAPREDUCE-4921. JobClient should acquire HS token with RM principal (daryn via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432232 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 19:05:02 +00:00
Alejandro Abdelnur 4774c6a5b8 MAPREDUCE-4907. Ammendment, forgot to svn add testcase in original commit 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431511 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 17:28:27 +00:00
Alejandro Abdelnur 572f7f45d6 MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 00:52:15 +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
Vinod Kumar Vavilapalli 76939f2877 MAPREDUCE-4810. Added new admin command options for MR AM. Contributed by Jerry Chen. 
svn merge --ignore-ancestry -c 1430707 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430708 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 06:33:01 +00:00
Arun Murthy 122cd0fb5b Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 05:31:53 +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
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
Jason Darrell Lowe ec4fc07c52 svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 19:27:56 +00:00
Robert Joseph Evans 52742c9a65 svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-28 15:06:15 +00:00
Jason Darrell Lowe 7bec80179b svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-26 20:49:39 +00:00
Luke Lu 307a46f6be MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant. (Yu Gao via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425179 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-21 23:08:54 +00:00
Jason Darrell Lowe 891e616d51 svn merge -c 1425071 FIXES: MAPREDUCE-4842. Shuffle race can hang reducer. Contributed by Mariappan Asokan 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425074 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-21 18:32:57 +00:00
Luke Lu 8636b12e35 YARN-223. Update process tree instead of getting new process trees. (Radim Kolar via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424242 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-20 00:19:40 +00:00
Thomas White 01c5d0eb77 Merge -r 1423469:1423470 from trunk to branch-2. Fixes: MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423471 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-18 15:25:09 +00:00
Alejandro Abdelnur 680b437f2f MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420350 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-11 19:29:18 +00:00
Alejandro Abdelnur 63d27f591c MAPREDUCE-4800. Cleanup o.a.h.mapred.MapTaskStatus - remove unused code. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410701 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-17 06:16:58 +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
Robert Joseph Evans 32850b486b svn merge -c 1408444 FIXES: MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by default (Ravi Prakash via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408447 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 20:38:55 +00:00
Robert Joseph Evans b3c28a5753 svn merge -c 1408355 FIXES: MAPREDUCE-4787. TestJobMonitorAndPrint is broken (Rob Parker via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408357 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 17:07:22 +00:00
Thomas White d488a59497 Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 13:57:19 +00:00
Robert Joseph Evans 82ccfb726a svn merge -c 1407505 FIXES: MAPREDUCE-4782. NLineInputFormat skips first line of last InputSplit (Mark Fuhs via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407506 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-09 15:53:52 +00:00
Robert Joseph Evans 6b3db6eabd svn merge -c 1407118 FIXES: MAPREDUCE-4772. Fetch failures can take way too long for a map to be restarted (bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407126 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-08 15:21:36 +00:00
Robert Joseph Evans cb0f68cc3f svn merge -c 1405975. FIXES: MAPREDUCE-4771. KeyFieldBasedPartitioner not partitioning properly when configured (jlowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405988 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-05 22:16:51 +00:00
Robert Joseph Evans d9e5740ce7 svn merge -c 1404674 FIXES: MAPREDUCE-4746. The MR Application Master does not have a config to set environment variables (Rob Parker via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404676 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-01 17:07:24 +00:00
Thomas Graves b958fa85a5 merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-31 15:02:59 +00:00
Alejandro Abdelnur d3e2e2cb68 MAPREDUCE-1806. CombineFileInputFormat does not work with paths not on default FS. (Gera Shegalov via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403618 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-30 05:52:17 +00:00
Vinod Kumar Vavilapalli 79a14bb25f MAPREDUCE-4730. Fix Reducer's EventFetcher to scale the map-completion requests slowly to avoid HADOOP-8942. Contributed by Jason Lowe. 
svn merge --ignore-ancestry -c 1401941 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401942 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-25 01:27:17 +00:00
Daryn Sharp 7b36e659c1 svn merge -c 1401467/1401473 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401483 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-23 21:10:17 +00:00
Robert Joseph Evans 0f4838ab6b svn merge -c 1399011. FIXES: MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-16 22:00:51 +00:00
Arun Murthy 267bfc5ff2 Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-11 17:22:27 +00:00
Harsh J 9a0f100130 MAPREDUCE-3678. The Map tasks logs should have the value of input split it processed. Contributed by Harsh J. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396034 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-09 13:41:45 +00:00
Arun Murthy e619da2136 Reverted MAPREDUCE-4253 from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390655 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-26 18:43:17 +00:00
Thomas White 9e1860bfbf Merge -r 1384832:1384833 from trunk to branch-2. Fixes: HADOOP-8780. Update DeprecatedProperties apt file. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384835 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-14 16:15:20 +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
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
Jonathan Turner Eagles a64a30ce6c svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-31 21:31:23 +00:00
Robert Joseph Evans 8ef7e47241 svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-31 20:39:03 +00:00
Robert Joseph Evans 0fb6e7626f HADOOP-8726. The Secrets in Credentials are not available to MR tasks (daryn and Benoy Antony via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379105 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-30 19:59:53 +00:00
Thomas White 9f94b89742 Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-30 17:14:07 +00:00
Alejandro Abdelnur 2ff2b79e33 MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-24 23:38:21 +00:00
Robert Joseph Evans bc5f02bac0 svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-23 18:07:59 +00:00
Alejandro Abdelnur 6e831b0f5e MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-23 00:24:36 +00:00
Robert Joseph Evans 1ee0c23b39 svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-21 17:47:08 +00:00
Robert Joseph Evans f3f8edbd10 svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-21 15:21:30 +00:00
Daryn Sharp a8f10869a8 svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-17 16:26:01 +00:00
Thomas White 832e7c6dc3 Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 13:27:24 +00:00
Tsz-wo Sze 1294ad1df7 svn merge -c 1373683 from trunk for HADOOP-8700. Use enum to define the checksum constants in DataChecksum. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373686 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 01:42:16 +00:00
Alejandro Abdelnur fc783dcc1e MAPREDUCE-4511. Add IFile readahead (ahmed via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-15 23:11:00 +00:00
Alejandro Abdelnur b344870bdd HADOOP-8681. add support for HTTPS to the web UIs. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 21:56:31 +00:00
Thomas Graves 6f516ea1bf merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 21:50:21 +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 4850bf623c merge -r 1366257:1366258 from trunk. FIXES: MAPREDUCE-4423 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366260 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-27 01:48:54 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-26 13:25:41 +00:00
Thomas Graves dce4a7c765 merge -r 1365239:1365240 from trunk. FIXES: MAPREDUCE-4467 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365241 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-24 19:28:43 +00:00
Thomas Graves 45c42817ca svn merge --change -1363455 for reverting MAPREDUCE-4423 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363936 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-20 20:21:09 +00:00
Thomas Graves 5568bf8260 merge -r 1363453:1363454 from trunk. FIXES: MAPREDUCE-4423 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363455 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-19 18:22:03 +00:00
Robert Joseph Evans f8bd54b16a svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362613 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-17 19:15:30 +00:00
Robert Joseph Evans 3260960be3 svn merge -c 1361389 FIXES: MAPREDUCE-4419. ./mapred queue -info <queuename> -showJobs displays all the jobs irrespective of <queuename> (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361391 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-13 20:45:05 +00:00
Harsh J f457ffb05b Backport of MAPREDUCE-4432 from trunk. Confusing warning message when GenericOptionsParser is not used. Contributed by Gabriel Reid. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361275 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-13 15:23:09 +00:00
Robert Joseph Evans 75af3cba6b svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-12 15:53:38 +00:00
Harsh J 91472c5539 Backport of HADOOP-3886 from trunk. svn merge -c 1360222 ../../trunk (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360224 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-11 15:07:34 +00:00
Alejandro Abdelnur 3097c15d9d Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-09 19:19:42 +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
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
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
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
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
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 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 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 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
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
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
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 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
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
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
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
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 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
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
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
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
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