1282 Commits

Author	SHA1	Message	Date
Arun Murthy	c03040a498	Merge -c 1527048 from trunk to branch-2 to fix MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527054 13f79535-47bb-0310-9956-ffa450edef68	2013-09-27 20:04:31 +00:00
Jason Darrell Lowe	d36dec185e	svn commit -c 1527037 FIXES: MAPREDUCE-5545. org.apache.hadoop.mapred.TestTaskAttemptListenerImpl.testCommitWindow times out. Contributed by Robert Kanter ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527039 13f79535-47bb-0310-9956-ffa450edef68	2013-09-27 19:17:24 +00:00
Arun Murthy	146d9264a9	Merge -c 1527033 from trunk to branch-2 to fix MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID, TaskAttemptID) by re-introducing missing constructors. Contributed by Robert Kanter. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527034 13f79535-47bb-0310-9956-ffa450edef68	2013-09-27 19:10:07 +00:00
Jason Darrell Lowe	d8e9a472e7	svn merge -c 1527015 FIXES: MAPREDUCE-5332. Support token-preserving restart of history server. Contributed by Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527016 13f79535-47bb-0310-9956-ffa450edef68	2013-09-27 18:26:09 +00:00
Arun Murthy	78045b7abc	Merge -c 1526735 from trunk to branch-2 to fix MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526736 13f79535-47bb-0310-9956-ffa450edef68	2013-09-26 23:03:25 +00:00
Jason Darrell Lowe	2b7ae8dd5d	svn merge -c 1526688 FIXES: MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526702 13f79535-47bb-0310-9956-ffa450edef68	2013-09-26 21:21:34 +00:00
Chris Nauroth	6bdd4791db	MAPREDUCE-5525. Merging change r1526624 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526625 13f79535-47bb-0310-9956-ffa450edef68	2013-09-26 17:47:45 +00:00
Colin McCabe	fa2a3c94f2	HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68	2013-09-26 15:24:40 +00:00
Vinod Kumar Vavilapalli	6e132b1a2b	MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee. ... svn merge --ignore-ancestry -c 1526377 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526379 13f79535-47bb-0310-9956-ffa450edef68	2013-09-26 04:30:36 +00:00
Vinod Kumar Vavilapalli	b41137c73a	MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526364 13f79535-47bb-0310-9956-ffa450edef68	2013-09-26 03:02:06 +00:00
Bikas Saha	a5ecb4de41	Merge r1526071 from trunk to branch-2 for MAPREDUCE-5505. Clients should be notified job finished only after job successfully unregistered (Zhijie Shen via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526072 13f79535-47bb-0310-9956-ffa450edef68	2013-09-25 00:53:10 +00:00
Siddharth Seth	e23d5672a7	merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68	2013-09-25 00:37:14 +00:00
Vinod Kumar Vavilapalli	2daddb610e	YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi. ... MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi. svn merge --ignore-ancestry -c 1525947 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68	2013-09-24 17:20:48 +00:00
Robert Joseph Evans	e2bfdfc585	svn merge -c 1525670 FIXES: MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525673 13f79535-47bb-0310-9956-ffa450edef68	2013-09-23 18:39:47 +00:00
Vinod Kumar Vavilapalli	d71bb8385b	YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi. ... MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi. svn merge --ignore-ancestry -c 1524864 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68	2013-09-19 23:51:14 +00:00
Vinod Kumar Vavilapalli	d8ed9ef4b8	MAPREDUCE-5488. Changed MR client to keep trying to reach the application when it sees that on attempt's AM is down. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1524856 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524857 13f79535-47bb-0310-9956-ffa450edef68	2013-09-19 22:36:58 +00:00
Thomas Graves	11d0fe9722	MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524843 13f79535-47bb-0310-9956-ffa450edef68	2013-09-19 21:00:40 +00:00
Sanford Ryza	f0e79b8157	MAPREDUCE-5487. In task processes, JobConf is unnecessarily loaded again in Limits (Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524417 13f79535-47bb-0310-9956-ffa450edef68	2013-09-18 13:58:37 +00:00
Arun Murthy	73c69decf1	Merge -c 1523660 from trunk to branch-2 to fix MAPREDUCE-5493. Cleanup in-memory & on-disk segments to prevent leak on shuffle completion. Contributed by Jason Lowe. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523661 13f79535-47bb-0310-9956-ffa450edef68	2013-09-16 14:19:33 +00:00
Arun Murthy	c061a0da55	Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68	2013-09-16 14:06:27 +00:00
Alejandro Abdelnur	7993c89ea8	MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523607 13f79535-47bb-0310-9956-ffa450edef68	2013-09-16 12:20:30 +00:00
Bikas Saha	c5ef30971e	Merge r1523376 from trunk to branch-2 for YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68	2013-09-15 01:07:11 +00:00
Bikas Saha	87d09e5ebe	Merge r1523146 from trunk to branch-2 YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523149 13f79535-47bb-0310-9956-ffa450edef68	2013-09-13 23:57:56 +00:00
Vinod Kumar Vavilapalli	90f492e532	MAPREDUCE-5497. Changed MRAppMaster to sleep only after doing everything else but just before ClientService to avoid race conditions during RM restart. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1521699 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521700 13f79535-47bb-0310-9956-ffa450edef68	2013-09-11 00:39:21 +00:00
Thomas Graves	a574ef2864	MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521584 13f79535-47bb-0310-9956-ffa450edef68	2013-09-10 18:53:29 +00:00
Devarajulu K	d997ca22f9	MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou. ... svn merge --ignore-ancestry -c 1520964 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520965 13f79535-47bb-0310-9956-ffa450edef68	2013-09-09 06:46:16 +00:00
Jason Darrell Lowe	5ddee655e4	svn merge -c 1520156 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520157 13f79535-47bb-0310-9956-ffa450edef68	2013-09-04 22:32:35 +00:00
Sanford Ryza	ab02296741	HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68	2013-08-31 02:13:11 +00:00
Sanford Ryza	997e2f4fd3	MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518858 13f79535-47bb-0310-9956-ffa450edef68	2013-08-29 23:53:29 +00:00
Vinod Kumar Vavilapalli	7b8795012e	MAPREDUCE-5441. Changed MR AM to return RUNNING state if exiting when RM commands to reboot, so that client can continue to track the overall job. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1518821 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518824 13f79535-47bb-0310-9956-ffa450edef68	2013-08-29 21:10:54 +00:00
Alejandro Abdelnur	23cbe7af90	MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518773 13f79535-47bb-0310-9956-ffa450edef68	2013-08-29 19:26:31 +00:00
Vinod Kumar Vavilapalli	ba89f8efc7	YARN-1085. Addendum patch to address issues with the earlier patch. ... svn merge --ignore-ancestry -c 1517721 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517722 13f79535-47bb-0310-9956-ffa450edef68	2013-08-26 23:01:23 +00:00
Vinod Kumar Vavilapalli	2d9c88f45e	YARN-1074. Cleaned up YARN CLI application list to only display running applications by default. Contributed by Xuan Gong. ... svn merge --ignore-ancestry -c 1517196 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517197 13f79535-47bb-0310-9956-ffa450edef68	2013-08-24 21:17:11 +00:00
Vinod Kumar Vavilapalli	a42a5e153c	YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1517101 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517102 13f79535-47bb-0310-9956-ffa450edef68	2013-08-24 02:48:17 +00:00
Jason Darrell Lowe	35f60e71de	svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517098 13f79535-47bb-0310-9956-ffa450edef68	2013-08-24 01:23:39 +00:00
Jason Darrell Lowe	25595863d3	svn merge -c 1517085 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517086 13f79535-47bb-0310-9956-ffa450edef68	2013-08-23 22:55:45 +00:00
Vinod Kumar Vavilapalli	91d8768381	MAPREDUCE-5476. Changed MR AM recovery code to cleanup staging-directory only after unregistering from the RM. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1516660 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516662 13f79535-47bb-0310-9956-ffa450edef68	2013-08-22 23:17:57 +00:00
Chris Nauroth	3ad42fba26	MAPREDUCE-5470. Merging change r1516623 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516625 13f79535-47bb-0310-9956-ffa450edef68	2013-08-22 21:43:57 +00:00
Jason Darrell Lowe	8d1cd8ddb7	svn merge -c 1516594 FIXES: Revert MAPREDUCE-5475 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516596 13f79535-47bb-0310-9956-ffa450edef68	2013-08-22 20:38:06 +00:00
Arun Murthy	b9cee48717	Merge -c 1516361 from trunk to branch-2 to fix MAPREDUCE-5475. Ensure MRClientService verifies ACLs for users. Contributed by Jason Lowe. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516362 13f79535-47bb-0310-9956-ffa450edef68	2013-08-22 02:00:29 +00:00
Arun Murthy	e8268b8a5d	Merge -c 1516358 from trunk to branch-2 to fix MAPREDUCE-5468. Fix MR AM recovery for map-only jobs. Contributed by Vinod K. V. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516359 13f79535-47bb-0310-9956-ffa450edef68	2013-08-22 01:53:18 +00:00
Vinod Kumar Vavilapalli	83c4906a2e	MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1516238 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516240 13f79535-47bb-0310-9956-ffa450edef68	2013-08-21 18:18:13 +00:00
Luke Lu	d83061b71b	HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68	2013-08-21 10:13:17 +00:00
Jason Darrell Lowe	6f27db80ac	svn merge -c 1515863 FIXES: MAPREDUCE-5001. LocalJobRunner has race condition resulting in job failures. Contributed by Sandy Ryza ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515877 13f79535-47bb-0310-9956-ffa450edef68	2013-08-20 17:00:06 +00:00
Sanford Ryza	0c32694b27	MAPREDUCE-5462. In map-side sort, swap entire meta entries instead of indexes for better cache performance. (Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514610 13f79535-47bb-0310-9956-ffa450edef68	2013-08-16 08:14:58 +00:00
Alejandro Abdelnur	eee2b37a3a	HADOOP-9872. Improve protoc version handling and detection. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68	2013-08-14 22:29:46 +00:00
Alejandro Abdelnur	677bbd336d	HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68	2013-08-14 22:25:26 +00:00
Sanford Ryza	0d54ef3b62	MAPREDUCE-5454. TestDFSIO fails intermittently on JDK7 (Karthik Kambatla via Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513376 13f79535-47bb-0310-9956-ffa450edef68	2013-08-13 07:12:49 +00:00
Jason Darrell Lowe	432eef4ede	svn merge -c 1511464 FIXES: MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7. Contributed by Robert Parker ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511467 13f79535-47bb-0310-9956-ffa450edef68	2013-08-07 20:07:15 +00:00
Sanford Ryza	2a7293a254	MAPREDUCE-434. LocalJobRunner limited to single reducer (Sandy Ryza and Aaron Kimball via Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510867 13f79535-47bb-0310-9956-ffa450edef68	2013-08-06 06:40:42 +00:00
Sanford Ryza	75c40235aa	MAPREDUCE-5399. Unnecessary Configuration instantiation in IFileInputStream slows down merge. (Stanislav Barton via Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510813 13f79535-47bb-0310-9956-ffa450edef68	2013-08-05 23:35:03 +00:00
Sanford Ryza	3490c9aab7	MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510612 13f79535-47bb-0310-9956-ffa450edef68	2013-08-05 17:12:58 +00:00
Kihwal Lee	7d36680e73	svn merge -c 1510581 Merging from trunk to branch-2 to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510583 13f79535-47bb-0310-9956-ffa450edef68	2013-08-05 16:05:04 +00:00
Jason Darrell Lowe	b4c28a1aa9	svn merge -c 1509401 FIXES: MAPREDUCE-5428. HistoryFileManager doesn't stop threads when service is stopped. Contributed by Karthik Kambatla ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509404 13f79535-47bb-0310-9956-ffa450edef68	2013-08-01 20:03:08 +00:00
Siddharth Seth	d7f082ad5f	merge MAPREDUCE-5352 from trunk. Optimize node local splits generated by CombineFileInputFormat. (sseth) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509346 13f79535-47bb-0310-9956-ffa450edef68	2013-08-01 17:43:40 +00:00
Vinod Kumar Vavilapalli	d00dcbd2f5	MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1508595 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508596 13f79535-47bb-0310-9956-ffa450edef68	2013-07-30 20:05:19 +00:00
Jason Darrell Lowe	3bd5174a8e	svn merge -c 1508220 FIXES: MAPREDUCE-5411. Refresh size of loaded job cache on history server. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508224 13f79535-47bb-0310-9956-ffa450edef68	2013-07-29 22:48:00 +00:00
Alejandro Abdelnur	126337bba6	YARN-937. Fix unmanaged AM in non-secure/secure setup post YARN-701. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507708 13f79535-47bb-0310-9956-ffa450edef68	2013-07-27 20:08:59 +00:00
Tsz-wo Sze	3c08e71316	svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507586 13f79535-47bb-0310-9956-ffa450edef68	2013-07-27 07:01:51 +00:00
Tsz-wo Sze	4c045ebafd	svn merge -c 1380921 from trunk for YARN-84. Use Builder to build RPC server. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507582 13f79535-47bb-0310-9956-ffa450edef68	2013-07-27 06:47:40 +00:00
Jason Darrell Lowe	5df508c539	svn merge -c 1507486 FIXES: MAPREDUCE-5419. TestSlive is getting FileNotFound Exception. Contributed by Robert Parker ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507487 13f79535-47bb-0310-9956-ffa450edef68	2013-07-26 22:03:15 +00:00
Vinod Kumar Vavilapalli	6bc4693384	MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. Contributed by Junping Du. ... svn merge --ignore-ancestry -c 1507401 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507402 13f79535-47bb-0310-9956-ffa450edef68	2013-07-26 19:16:08 +00:00
Jason Darrell Lowe	f6611d89c8	svn merge -c 1507385 FIXES: MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus. Contributed by Hairong Kuang and Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507387 13f79535-47bb-0310-9956-ffa450edef68	2013-07-26 18:22:00 +00:00
Jason Darrell Lowe	fca19f6a8a	svn merge -c 1507135 FIXES: MAPREDUCE-5386. Ability to refresh history server job retention and job cleaner settings. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507378 13f79535-47bb-0310-9956-ffa450edef68	2013-07-26 17:32:00 +00:00
Jason Darrell Lowe	b11cceb25c	svn merge -c 1507104 FIXES: MAPREDUCE-5251. Reducer should not implicate map attempt if it has insufficient space to fetch map output. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507105 13f79535-47bb-0310-9956-ffa450edef68	2013-07-25 19:45:20 +00:00
Alejandro Abdelnur	98eb429771	MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506759 13f79535-47bb-0310-9956-ffa450edef68	2013-07-24 22:33:59 +00:00
Vinod Kumar Vavilapalli	f487f4eb19	YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He. ... MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He. svn merge --ignore-ancestry -c 1506391 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68	2013-07-24 03:42:52 +00:00
Jason Darrell Lowe	d6be90bccf	svn merge -c 1506226 FIXES: MAPREDUCE-5356. Ability to refresh aggregated log retention period and check interval. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506230 13f79535-47bb-0310-9956-ffa450edef68	2013-07-23 19:25:19 +00:00
Colin McCabe	5ff0774e8a	HDFS-4817. Make HDFS advisory caching configurable on a per-file basis. (Colin Patrick McCabe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506188 13f79535-47bb-0310-9956-ffa450edef68	2013-07-23 17:54:44 +00:00
Jason Darrell Lowe	673b762364	svn merge -c 1506154 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506157 13f79535-47bb-0310-9956-ffa450edef68	2013-07-23 16:58:41 +00:00
Jason Darrell Lowe	726533a741	svn merge -c 1505771 FIXES: MAPREDUCE-5404. HSAdminServer does not use ephemeral ports in minicluster mode. Contributed by Ted Yu ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505772 13f79535-47bb-0310-9956-ffa450edef68	2013-07-22 19:06:07 +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
Arun Murthy	f7080007ad	Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504736 13f79535-47bb-0310-9956-ffa450edef68	2013-07-19 00:58:33 +00:00
Jason Darrell Lowe	9b1bc20045	svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68	2013-07-18 20:47:58 +00:00
Arun Murthy	d82a3cd227	Merge -c from trunk to branch-2 to fix YARN-701. Use application tokens irrespective of secure or non-secure mode. Contributed by Vinod K V. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504605 13f79535-47bb-0310-9956-ffa450edef68	2013-07-18 19:04:37 +00:00
Bikas Saha	41c05101e7	Merge r1503934 from trunk to branch-2 for MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503936 13f79535-47bb-0310-9956-ffa450edef68	2013-07-16 22:56:54 +00:00
Jason Darrell Lowe	2386e127b8	svn merge -c 1503744 to revert MAPREDUCE-5317. Stale files left behind for failed jobs ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503747 13f79535-47bb-0310-9956-ffa450edef68	2013-07-16 15:06:42 +00:00
Jason Darrell Lowe	293d42edf0	svn merge -c 1503499 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503505 13f79535-47bb-0310-9956-ffa450edef68	2013-07-15 22:30:39 +00:00
Chris Nauroth	9bd8745846	MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68	2013-07-10 23:08:34 +00:00
Hitesh Shah	1157061429	merge -c 1501599 from trunk to branch-2 to fix YARN-727, MAPREDUCE-5325. ClientRMProtocol.getAllApplications should accept ApplicationType as a parameter. Contributed by Xuan Gong. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501600 13f79535-47bb-0310-9956-ffa450edef68	2013-07-09 23:07:15 +00:00
Vinod Kumar Vavilapalli	16841d50c5	YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza. ... svn merge --ignore-ancestry -c 1500994 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500995 13f79535-47bb-0310-9956-ffa450edef68	2013-07-08 22:33:43 +00:00
Chris Nauroth	2a448cc5e7	MAPREDUCE-5366. Merging change r1500842 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500848 13f79535-47bb-0310-9956-ffa450edef68	2013-07-08 17:17:07 +00:00
Chris Nauroth	81bfd0316e	MAPREDUCE-5360. Merging change r1500194 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500195 13f79535-47bb-0310-9956-ffa450edef68	2013-07-06 03:42:43 +00:00
Jason Darrell Lowe	afeff43d7a	svn merge -c 1499425 FIXES: MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499426 13f79535-47bb-0310-9956-ffa450edef68	2013-07-03 14:46:54 +00:00
Chris Nauroth	8c10908e1e	MAPREDUCE-5357. Merging change r1499210 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499217 13f79535-47bb-0310-9956-ffa450edef68	2013-07-03 05:37:34 +00:00
Chris Nauroth	0f3bb0567d	MAPREDUCE-5359. Merging change r1499153 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499154 13f79535-47bb-0310-9956-ffa450edef68	2013-07-03 00:01:28 +00:00
Chris Nauroth	6c703d6ef0	MAPREDUCE-5355. Merging change r1499148 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499149 13f79535-47bb-0310-9956-ffa450edef68	2013-07-02 23:32:41 +00:00
Jason Darrell Lowe	199485bcdf	svn merge -c 1499125 FIXES: MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the input path dir. Contributed by Devaraj K ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499127 13f79535-47bb-0310-9956-ffa450edef68	2013-07-02 22:00:43 +00:00
Chris Nauroth	5808ba30dd	MAPREDUCE-5349. TestClusterMapReduceTestCase and TestJobName fail on Windows in branch-2. Contributed by Chuan Liu. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498144 13f79535-47bb-0310-9956-ffa450edef68	2013-06-30 15:53:29 +00:00
Alejandro Abdelnur	5d45387c00	MAPREDUCE-5333. Add test that verifies MRAM works correctly when sending requests with non-normalized capabilities. (ywskycn via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497881 13f79535-47bb-0310-9956-ffa450edef68	2013-06-28 18:55:31 +00:00
Arun Murthy	2977cbfc83	Merge -c 1496741 from trunk to branch-2 to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496742 13f79535-47bb-0310-9956-ffa450edef68	2013-06-26 05:50:23 +00:00
Vinod Kumar Vavilapalli	34dfd27833	YARN-851. Share NMTokens using NMTokenCache (api-based) between AMRMClient and NMClient instead of memory based approach which is used currently. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1495247 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495248 13f79535-47bb-0310-9956-ffa450edef68	2013-06-21 00:09:45 +00:00
Siddharth Seth	aa1eba9930	merge MAPREDUCE-5334 from trunk. Fix failing unit tests - TestContainerLauncher, TestContainerLauncherImpl. Contributed by Vinod Kumar Vavilapalli. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494821 13f79535-47bb-0310-9956-ffa450edef68	2013-06-20 00:36:28 +00:00
Jonathan Turner Eagles	d8203c0ae9	MAPREDUCE-5084. fix coverage org.apache.hadoop.mapreduce.v2.app.webapp and org.apache.hadoop.mapreduce.v2.hs.webapp (Aleksey Gorshkov via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494687 13f79535-47bb-0310-9956-ffa450edef68	2013-06-19 16:40:20 +00:00
Arun Murthy	6f790ac7ad	Merge -c 1494476 from trunk to branch-2 to fix YARN-553. Replaced YarnClient.getNewApplication with YarnClient.createApplication which provides a directly usable ApplicationSubmissionContext to simplify the api. Contributed by Karthik Kambatla. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494477 13f79535-47bb-0310-9956-ffa450edef68	2013-06-19 07:07:44 +00:00
Christopher Douglas	6267cddbd6	MAPREDUCE-5194. Heed interrupts during Fetcher shutdown. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494417 13f79535-47bb-0310-9956-ffa450edef68	2013-06-19 02:12:20 +00:00
Vinod Kumar Vavilapalli	368c7ae735	YARN-694. Starting to use NMTokens to authenticate all communication with NodeManagers. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1494369 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494370 13f79535-47bb-0310-9956-ffa450edef68	2013-06-18 23:20:34 +00:00
Jason Darrell Lowe	20a950a374	MAPREDUCE-5316. job -list-attempt-ids command does not handle illegal task-state. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494292 13f79535-47bb-0310-9956-ffa450edef68	2013-06-18 20:39:56 +00:00
Vinod Kumar Vavilapalli	af90aa5265	YARN-841. Move Auxiliary service to yarn-api, annotate and document it. Contributed by Vinod Kumar Vavilapalli. ... svn merge --ignore-ancestry -c 1494031 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494032 13f79535-47bb-0310-9956-ffa450edef68	2013-06-18 06:23:54 +00:00
Arun Murthy	8ac6ecc7d4	Merge -c 1494027 from trunk to branch-2 to fix YARN-840. Moved ProtoUtils to yarn.api.records.pb.impl. Contributed by Jian He. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494029 13f79535-47bb-0310-9956-ffa450edef68	2013-06-18 05:59:54 +00:00
Vinod Kumar Vavilapalli	8e9a719712	YARN-834. Fixed annotations for yarn-client module, reorganized packages and clearly differentiated *Async apis. Contributed by Arun C Murthy and Zhijie Shen. ... svn merge --ignore-ancestry -c 1494017 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494018 13f79535-47bb-0310-9956-ffa450edef68	2013-06-18 04:03:43 +00:00
Siddharth Seth	5e257b8925	merge YARN-805 from trunk. Fix javadoc and annotations on classes in the yarn-api package. Contributed by Jian He. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493993 13f79535-47bb-0310-9956-ffa450edef68	2013-06-18 03:14:38 +00:00
Vinod Kumar Vavilapalli	c01d820c18	YARN-610. ClientToken is no longer set in the environment of the Containers. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1493968 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493969 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 23:14:15 +00:00
Vinod Kumar Vavilapalli	a601f15ebe	YARN-822. Renamed ApplicationToken to be AMRMToken, and similarly the corresponding TokenSelector and SecretManager. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1493889 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493890 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 19:12:12 +00:00
Vinod Kumar Vavilapalli	ce23eea57f	YARN-837. Moved yarn.ClusterInfo into MapReduce project as it doesn't belong to YARN. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1493676 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493677 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 08:15:05 +00:00
Vinod Kumar Vavilapalli	04bea5f2fd	YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1493654 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493655 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 06:52:39 +00:00
Vinod Kumar Vavilapalli	e40b5a3eb9	HADOOP-9649. Promoted YARN service life-cycle libraries into Hadoop Common for usage across all Hadoop projects. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1493650 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493651 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 06:41:49 +00:00
Vinod Kumar Vavilapalli	39aaf79717	YARN-826. Moved Clock and SystemClock into yarn.util package. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1493639 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493640 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 04:50:30 +00:00
Arun Murthy	68807a65c2	Merge -c 1493623 from trunk to branch-2 to fix YARN-387. Renamed YARN protocols for consistency. Contributed by Vinod K V. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493624 13f79535-47bb-0310-9956-ffa450edef68	2013-06-17 02:29:56 +00:00
Alejandro Abdelnur	c71d86cd7c	MAPREDUCE-5171. Expose blacklisted nodes from the MR AM REST API. (sandyr via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493603 13f79535-47bb-0310-9956-ffa450edef68	2013-06-16 22:20:45 +00:00
Vinod Kumar Vavilapalli	6039e5297c	YARN-829. Renamed RMTokenSelector to be RMDelegationTokenSelector. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1493577 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493578 13f79535-47bb-0310-9956-ffa450edef68	2013-06-16 20:34:02 +00:00
Arun Murthy	51bb83eabf	Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493571 13f79535-47bb-0310-9956-ffa450edef68	2013-06-16 19:10:32 +00:00
Arun Murthy	ae5df3d869	Merge -c 1493509 from trunk to branch-2 to fix YARN-787. Removed minimum resource from RegisterApplicationMasterResponse. Contributed by Alejandro Abdelnur. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493510 13f79535-47bb-0310-9956-ffa450edef68	2013-06-16 14:00:36 +00:00
Arun Murthy	a00e4a926d	Merge -c 1493445 from trunk to branch-2 to fix MAPREDUCE-5192. Allow for alternate resolutions of TaskCompletionEvents. Contributed by Chris Douglas. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493446 13f79535-47bb-0310-9956-ffa450edef68	2013-06-16 03:07:56 +00:00
Vinod Kumar Vavilapalli	dc8d2412fe	YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in FinishApplicationMasterRequest for consistency. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1493315 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493316 13f79535-47bb-0310-9956-ffa450edef68	2013-06-15 04:58:45 +00:00
Alejandro Abdelnur	77ae68f84e	MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493211 13f79535-47bb-0310-9956-ffa450edef68	2013-06-14 19:09:15 +00:00
Vinod Kumar Vavilapalli	da2a0ea3ce	YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1493138 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493139 13f79535-47bb-0310-9956-ffa450edef68	2013-06-14 16:11:36 +00:00
Arun Murthy	451f725b92	Merge -c 1492962 from trunk to branch-2 to fix MAPREDUCE-5319. Set user.name in job.xml. Contributed by Xuan Gong. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492963 13f79535-47bb-0310-9956-ffa450edef68	2013-06-14 06:27:38 +00:00
Vinod Kumar Vavilapalli	6418929696	YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1492903 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492904 13f79535-47bb-0310-9956-ffa450edef68	2013-06-13 23:26:20 +00:00
Jason Darrell Lowe	85543c3683	MAPREDUCE-4019. -list-attempt-ids is not working. Contributed by Ashwin Shankar, Devaraj K, and B Anil Kumar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492877 13f79535-47bb-0310-9956-ffa450edef68	2013-06-13 21:35:34 +00:00
Vinod Kumar Vavilapalli	027f71eb05	MAPREDUCE-5199. Removing ApplicationTokens file as it is no longer needed. Contributed by Daryn Sharp. ... svn merge --ignore-ancestry -c 1492848 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492849 13f79535-47bb-0310-9956-ffa450edef68	2013-06-13 20:21:03 +00:00
Vinod Kumar Vavilapalli	903f0fea8e	YARN-530. Defined Service model strictly, implemented AbstractService for robust subclassing and migrated yarn-common services. Contributed by Steve Loughran. ... YARN-117. Migrated rest of YARN to the new service model. Contributed by Steve Louhran. MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. Contributed by Steve Loughran. svn merge --ignore-ancestry -c 1492718 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492720 13f79535-47bb-0310-9956-ffa450edef68	2013-06-13 15:56:44 +00:00
Chris Nauroth	87c96a022e	MAPREDUCE-5259. Merging change r1492364 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492367 13f79535-47bb-0310-9956-ffa450edef68	2013-06-12 19:00:05 +00:00
Alejandro Abdelnur	3af49516ca	MAPREDUCE-5304. mapreduce.Job killTask/failTask/getTaskCompletionEvents methods have incompatible signature changes. (kkambatl via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492362 13f79535-47bb-0310-9956-ffa450edef68	2013-06-12 18:50:46 +00:00
Jason Darrell Lowe	12f72e0ba6	svn merge -c 1491611 FIXES: MAPREDUCE-5308. Shuffling to memory can get out-of-sync when fetching multiple compressed map outputs. Contributed by Nathan Roberts ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491614 13f79535-47bb-0310-9956-ffa450edef68	2013-06-10 21:45:35 +00:00
Alejandro Abdelnur	f55574bfdf	MAPREDUCE-5312. TestRMNMInfo is failing. (sandyr via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491044 13f79535-47bb-0310-9956-ffa450edef68	2013-06-08 19:43:11 +00:00
Bikas Saha	485c04d0a4	Merge r1490470 from trunk to branch-2 for YARN-759. Create Command enum in AllocateResponse (bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490473 13f79535-47bb-0310-9956-ffa450edef68	2013-06-06 23:43:38 +00:00
Bikas Saha	09c12434a2	Merge r1490392 from trunk to branch-2 for YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490396 13f79535-47bb-0310-9956-ffa450edef68	2013-06-06 19:03:27 +00:00
Vinod Kumar Vavilapalli	6f8b6699bd	YARN-724. Moved ProtoBase from api.records to api.records.impl.pb. Contributed by Jian He. ... MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via YARN-724. Contributed by Jian He. svn merge --ignore-ancestry -c 1489658 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489659 13f79535-47bb-0310-9956-ffa450edef68	2013-06-04 22:47:05 +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
Vinod Kumar Vavilapalli	377f3ef85b	YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. Contributed by Bikas Saha. ... svn merge --ignore-ancestry -c 1489295 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489296 13f79535-47bb-0310-9956-ffa450edef68	2013-06-04 05:55:22 +00:00
Vinod Kumar Vavilapalli	5f20c37919	YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth. ... MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489288 13f79535-47bb-0310-9956-ffa450edef68	2013-06-04 04:50:16 +00:00
Jason Darrell Lowe	3b6035ba83	svn merge -c 1489271 FIXES: MAPREDUCE-5283. Over 10 different tests have near identical implementations of AppContext. Contributed by Sandy Ryza ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489272 13f79535-47bb-0310-9956-ffa450edef68	2013-06-04 01:55:15 +00:00
Vinod Kumar Vavilapalli	cafa5d8bb5	YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He. ... MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He. svn merge --ignore-ancestry -c 1489257 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489262 13f79535-47bb-0310-9956-ffa450edef68	2013-06-04 00:56:26 +00:00
Arun Murthy	620c7fe36f	Merge -c 1489236 from trunk to branch-2 to fix MAPREDUCE-5245. Added back constants to JobConf to fix incompatibilities. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489237 13f79535-47bb-0310-9956-ffa450edef68	2013-06-03 23:57:08 +00:00
Arun Murthy	6edd290758	Merge -c 1489227 from trunk to branch-2 to fix MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489228 13f79535-47bb-0310-9956-ffa450edef68	2013-06-03 23:43:14 +00:00
Arun Murthy	1d77b6c417	Merge -c 1489219 from trunk to branch-2 to fix MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489220 13f79535-47bb-0310-9956-ffa450edef68	2013-06-03 22:55:22 +00:00
Arun Murthy	89a1e48cd7	Merge -c 1489187 from trunk to branch-2 to fix MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489188 13f79535-47bb-0310-9956-ffa450edef68	2013-06-03 21:35:33 +00:00
Thomas White	f3c4f2b3e2	Merge -r 1489059:1489060 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@1489061 13f79535-47bb-0310-9956-ffa450edef68	2013-06-03 16:55:51 +00:00
Jason Darrell Lowe	f09946bd47	svn merge -c 1489012 FIXES: MAPREDUCE-5268. Improve history server startup performance. Contributed by Karthik Kambatla ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489015 13f79535-47bb-0310-9956-ffa450edef68	2013-06-03 14:51: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
Arun Murthy	7246cf9b41	Merge -c 1488806 from trunk to branch-2 to fix YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488807 13f79535-47bb-0310-9956-ffa450edef68	2013-06-02 22:55:31 +00:00
Vinod Kumar Vavilapalli	17476d2fa7	MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1488625 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488626 13f79535-47bb-0310-9956-ffa450edef68	2013-06-01 22:22:27 +00:00
Vinod Kumar Vavilapalli	3de04e6401	MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for binary compatibility with 1.x APIs. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1488621 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488623 13f79535-47bb-0310-9956-ffa450edef68	2013-06-01 22:12:25 +00:00
Vinod Kumar Vavilapalli	41ed12124c	YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He. ... MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He. svn merge --ignore-ancestry -c 1488616 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68	2013-06-01 21:45:24 +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
Vinod Kumar Vavilapalli	4e0ac70cea	MAPREDUCE-5280. Bring back removed constructor and a method in mapreduce ClusterMetrics for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1488458 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488459 13f79535-47bb-0310-9956-ffa450edef68	2013-06-01 03:59:23 +00:00
Vinod Kumar Vavilapalli	089b3edd0e	MAPREDUCE-5273. Bring back a couple of protected variables in mapred and mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1488442 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488443 13f79535-47bb-0310-9956-ffa450edef68	2013-06-01 00:34:24 +00:00
Siddharth Seth	cdab92d0c3	merge YARN-735 from trunk. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488440 13f79535-47bb-0310-9956-ffa450edef68	2013-06-01 00:15:53 +00:00
Vinod Kumar Vavilapalli	75a96a140a	MAPREDUCE-5231. Bring back a constructor in mapred's DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1488436 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488437 13f79535-47bb-0310-9956-ffa450edef68	2013-05-31 23:57:42 +00:00
Vinod Kumar Vavilapalli	297e916f41	MAPREDUCE-5275. Bring back a couple of APIs in mapreduce.security.TokenCache for binary compatibility with 1.x mapreduce APIs. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1488369 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488370 13f79535-47bb-0310-9956-ffa450edef68	2013-05-31 19:48:30 +00:00
Christopher Douglas	1711348e48	MAPREDUCE-5176. Add annotation for tagging tasks as responsive to ... preemption. Contributed by Carlo Curino, cdouglas git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488105 13f79535-47bb-0310-9956-ffa450edef68	2013-05-31 06:07:37 +00:00
Siddharth Seth	36ef457902	merge MAPREDUCE-5286 from trunk. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488088 13f79535-47bb-0310-9956-ffa450edef68	2013-05-31 04:18:50 +00:00
Vinod Kumar Vavilapalli	1a8872e1e0	MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1488060 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488061 13f79535-47bb-0310-9956-ffa450edef68	2013-05-30 23:54:06 +00:00
Vinod Kumar Vavilapalli	d95c5a23d9	MAPREDUCE-5261. Reverting the patch as it is no longer needed. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68	2013-05-30 21:54:28 +00:00
Vinod Kumar Vavilapalli	a099537780	YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth. ... MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth. svn merge --ignore-ancestry -c 1487994 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68	2013-05-30 20:19:53 +00:00
Siddharth Seth	0fb465cbc4	merge YARN-719 from trunk. Move RMIdentifier from Container to ContainerTokenIdentifier. Contributed by Vinod Kumar Vavilapalli. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487746 13f79535-47bb-0310-9956-ffa450edef68	2013-05-30 05:01:40 +00:00
Vinod Kumar Vavilapalli	6cb1cf3d1a	MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1487695 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487696 13f79535-47bb-0310-9956-ffa450edef68	2013-05-30 01:24:15 +00:00
Vinod Kumar Vavilapalli	71cc411340	MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen. ... Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality. svn merge --ignore-ancestry -c 1487175 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487176 13f79535-47bb-0310-9956-ffa450edef68	2013-05-29 00:43:47 +00:00
Vinod Kumar Vavilapalli	a2303831b4	MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He. ... svn merge --ignore-ancestry -c 1486271 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68	2013-05-28 22:38:14 +00:00
Vinod Kumar Vavilapalli	6c5055fe92	YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68	2013-05-24 23:11:25 +00:00
Suresh Srinivas	599b00e087	MAPREDUCE-5191. Merge r1484575 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486245 13f79535-47bb-0310-9956-ffa450edef68	2013-05-24 22:47:19 +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	3694a73ff8	HADOOP-9290. Merge r1476586 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68	2013-05-24 18:37:58 +00:00
Suresh Srinivas	5e007776f6	MAPREDUCE-4987. Merge r1470003 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486106 13f79535-47bb-0310-9956-ffa450edef68	2013-05-24 16:19:53 +00:00
Suresh Srinivas	02205fa797	HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68	2013-05-24 00:51:31 +00:00
Vinod Kumar Vavilapalli	004a9d5567	MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1485906 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485908 13f79535-47bb-0310-9956-ffa450edef68	2013-05-24 00:42:53 +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
Vinod Kumar Vavilapalli	35dc9545e1	YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal. ... MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal. svn merge --ignore-ancestry -c 1485790 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68	2013-05-23 18:02:45 +00:00
Vinod Kumar Vavilapalli	28822c2f64	MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1485491 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485494 13f79535-47bb-0310-9956-ffa450edef68	2013-05-22 23:13:19 +00:00
Vinod Kumar Vavilapalli	f71593ae2c	MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1485085 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485086 13f79535-47bb-0310-9956-ffa450edef68	2013-05-22 06:37:01 +00:00
Vinod Kumar Vavilapalli	c28a0860e2	MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1485079 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485080 13f79535-47bb-0310-9956-ffa450edef68	2013-05-22 06:25:03 +00:00
Vinod Kumar Vavilapalli	89f809bdff	MAPREDUCE-5235. Bring back old fields and exceptions in Counters for binary compatibility with mapred in 1.x. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1484992 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484993 13f79535-47bb-0310-9956-ffa450edef68	2013-05-21 22:01:02 +00:00
Vinod Kumar Vavilapalli	543bab20ed	MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1484349 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484351 13f79535-47bb-0310-9956-ffa450edef68	2013-05-19 21:15:54 +00:00
Jason Darrell Lowe	759e518509	svn merge -c 1483974 FIXES: MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific counters page for failed job. Contributed by Ashwin Shankar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483976 13f79535-47bb-0310-9956-ffa450edef68	2013-05-17 20:26:13 +00:00
Vinod Kumar Vavilapalli	d180262cf9	MAPREDUCE-5234. Change mapred.TaskReport and mapreduce.TaskReport for binary compatibility with mapred in 1.x but incompatible with 0.23.x. Contributed by Mayank Bansal. ... svn merge --ignore-ancestry -c 1483940 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483941 13f79535-47bb-0310-9956-ffa450edef68	2013-05-17 18:17:57 +00:00
Vinod Kumar Vavilapalli	f0bd8da38b	YARN-617. Made ContainerTokens to be used for validation at NodeManager also in unsecure mode to prevent AMs from faking resource requirements in unsecure mode. Contributed by Omkar Vinit Joshi. ... Merge from trunk revision 1483667 with little test modifications for proper merge. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483668 13f79535-47bb-0310-9956-ffa450edef68	2013-05-17 06:38:03 +00:00
Alejandro Abdelnur	2ed6ce3bfb	MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482624 13f79535-47bb-0310-9956-ffa450edef68	2013-05-14 22:14:15 +00:00
Vinod Kumar Vavilapalli	44a9273286	MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla. ... svn merge --ignore-ancestry -c 1482208 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482209 13f79535-47bb-0310-9956-ffa450edef68	2013-05-14 05:52:46 +00:00
Siddharth Seth	1f922d3c51	merge YARN-615 from trunk. Rename ContainerLaunchContext.containerTokens to tokens. Contributed by Vinod Kumar Vavilapalli. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482200 13f79535-47bb-0310-9956-ffa450edef68	2013-05-14 04:13:00 +00:00
Vinod Kumar Vavilapalli	6706e58f61	MAPREDUCE-5240. Fix a bug in MRAppMaster because of which OutputCommitter could not access credentials set by the user. Contributed by Vinod Kumar Vavilapalli. ... svn merge --ignore-ancestry -c 1482175 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482176 13f79535-47bb-0310-9956-ffa450edef68	2013-05-14 02:50:27 +00:00
Alejandro Abdelnur	7db8233722	MAPREDUCE-5220. Setter methods in TaskCompletionEvent are public in MR1 and protected in MR2. (sandyr via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482143 13f79535-47bb-0310-9956-ffa450edef68	2013-05-13 23:09:05 +00:00
Vinod Kumar Vavilapalli	3691cf65af	MAPREDUCE-5208. Bug-fix on branch-2 - tests weren't compiling. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482091 13f79535-47bb-0310-9956-ffa450edef68	2013-05-13 20:38:18 +00:00
Vinod Kumar Vavilapalli	99275f172a	MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv) ... svn merge --ignore-ancestry -c 1481695 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481696 13f79535-47bb-0310-9956-ffa450edef68	2013-05-13 03:36:15 +00:00
Vinod Kumar Vavilapalli	621db3a3cc	MAPREDUCE-5208. Modified ShuffleHandler to use SecureIOUtils for reading local files. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1481657 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481658 13f79535-47bb-0310-9956-ffa450edef68	2013-05-12 21:59:48 +00:00
Vinod Kumar Vavilapalli	2594db460f	YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth. ... MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth. svn merge --ignore-ancestry -c 1481205 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481209 13f79535-47bb-0310-9956-ffa450edef68	2013-05-10 21:51:32 +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
Vinod Kumar Vavilapalli	6aa0edc793	YARN-630. Changed AMRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong. ... MAPREDUCE-5226. Handling YarnRemoteException separately from IOException in MR App's use of AMRMProtocol after YARN-630. Contributed by Xuan Gong. svn merge --ignore-ancestry -c 1480529 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480530 13f79535-47bb-0310-9956-ffa450edef68	2013-05-09 05:32:52 +00:00
Vinod Kumar Vavilapalli	fc693ff519	YARN-631. Changed ClientRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong. ... MAPREDUCE-5212. Handling YarnRemoteException separately from IOException in MR App after YARN-631. Contributed by Xuan Gong. svn merge --ignore-ancestry -c 1480494 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480495 13f79535-47bb-0310-9956-ffa450edef68	2013-05-08 22:54:07 +00:00
Vinod Kumar Vavilapalli	4a0965323c	MAPREDUCE-5157. Bring back old sampler related code so that we can support binary compatibility with hadoop-1 sorter example. Contributed by Zhijie Shen. ... svn merge --ignore-ancestry -c 1480474 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480476 13f79535-47bb-0310-9956-ffa450edef68	2013-05-08 21:43:40 +00:00
Christopher Douglas	5cf0e57849	MAPREDUCE-5209. Fix units in a ShuffleScheduler log message. ... Contributed by Tsuyoshi OZAWA git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480472 13f79535-47bb-0310-9956-ffa450edef68	2013-05-08 21:36:43 +00:00
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
Vinod Kumar Vavilapalli	486391f766	YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong. ... MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong. svn merge --ignore-ancestry -c 1479680 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479684 13f79535-47bb-0310-9956-ffa450edef68	2013-05-06 19:20:02 +00:00
Vinod Kumar Vavilapalli	fb8d3fb0e4	MAPREDUCE-5205. Fixed MR App to load tokens correctly. Contributed by Vinod Kumar Vavilapalli. ... svn merge --ignore-ancestry -c 1479016 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479018 13f79535-47bb-0310-9956-ffa450edef68	2013-05-04 00:29:34 +00:00
Vinod Kumar Vavilapalli	0b64df0630	YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth. ... svn merge --ignore-ancestry -c 1478594 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478595 13f79535-47bb-0310-9956-ffa450edef68	2013-05-02 22:45:30 +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
Aaron Myers	96be135ffe	MAPREDUCE-5193. A few MR tests use block sizes which are smaller than the default minimum block size. Contributed by Andrew Wang. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478251 13f79535-47bb-0310-9956-ffa450edef68	2013-05-02 02:00:44 +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
Vinod Kumar Vavilapalli	e11dd72dc1	MAPREDUCE-5179. Fix unit test in TestHSWebServices which fails when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah. ... svn merge --ignore-ancestry -c 1476835 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476836 13f79535-47bb-0310-9956-ffa450edef68	2013-04-28 21:03:01 +00:00
Vinod Kumar Vavilapalli	ffe3368d94	YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He. ... MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68	2013-04-26 19:08:44 +00:00
Vinod Kumar Vavilapalli	a1fe9a0c9f	YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah. ... MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah. svn merge --ignore-ancestry -c 1475636 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475637 13f79535-47bb-0310-9956-ffa450edef68	2013-04-25 05:45:15 +00:00
Siddharth Seth	b392a65e2e	merge MAPREDUCE-5181 from trunk. RMCommunicator should not use AMToken from the env. Contributed by Vinod Kumar Vavilapalli. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471817 13f79535-47bb-0310-9956-ffa450edef68	2013-04-25 02:51:08 +00:00
Arun Murthy	c281269d0e	Merge -c 1471796 from trunk to branch-2 to fix MAPREDUCE-5166. Fix ConcurrentModificationException due to insufficient synchronization on updates to task Counters. Contributed by Sandy Ryza. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471797 13f79535-47bb-0310-9956-ffa450edef68	2013-04-25 00:55:00 +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
Thomas White	d53afdb144	Merge -r 1470693:1470694 from trunk to branch-2. Fixes: MAPREDUCE-5146. application classloader may be used too early to load classes. Contributed by Sangjin Lee. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470696 13f79535-47bb-0310-9956-ffa450edef68	2013-04-22 20:09:44 +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
Thomas Graves	d5a1fb4663	MAPREDUCE-5147. Maven build should create hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470038 13f79535-47bb-0310-9956-ffa450edef68	2013-04-19 20:55:05 +00:00
Vinod Kumar Vavilapalli	1bfb6af49f	YARN-441. Removed unused utility methods for collections from two API records. Contributed by Xuan Gong. ... MAPREDUCE-5163. Update MR App to not use API utility methods for collections after YARN-441. Contributed by Xuan Gong. svn merge --ignore-ancestry -c 1469657 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469658 13f79535-47bb-0310-9956-ffa450edef68	2013-04-19 01:34:04 +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
Vinod Kumar Vavilapalli	0df869e1f7	MAPREDUCE-5152. Make MR App to simply pass through the container from RM instead of extracting and populating information itself to start any container. Contributed by Vinod Kumar Vavilapalli. ... svn merge --ignore-ancestry -c 1469544 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469545 13f79535-47bb-0310-9956-ffa450edef68	2013-04-18 20:14:22 +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
Bikas Saha	2108a35d28	Merge -c r1469060 from trunk to branch-2 for MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469064 13f79535-47bb-0310-9956-ffa450edef68	2013-04-17 20:32:15 +00:00
Vinod Kumar Vavilapalli	7f3fd5f03d	Reverting my accidental revert of MAPREDUCE-5059 in the previous commit of YARN-500 from branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468743 13f79535-47bb-0310-9956-ffa450edef68	2013-04-17 04:22:34 +00:00
Vinod Kumar Vavilapalli	3d2430fad1	YARN-500. Fixed YARN webapps to not roll-over ports when explicitly asked to use non-ephemeral ports. Contributed by Kenji Kikushima. ... svn merge --ignore-ancestry -c 1468739 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468740 13f79535-47bb-0310-9956-ffa450edef68	2013-04-17 04:17:49 +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
Vinod Kumar Vavilapalli	8cc3b081fa	YARN-444. Moved special container exit codes from YarnConfiguration to API where they belong. Contributed by Sandy Ryza. ... MAPREDUCE-5151. Updated MR AM to use standard exit codes from the API after YARN-444. Contributed by Sandy Ryza. svn merge --ignore-ancestry -c 1468276 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468277 13f79535-47bb-0310-9956-ffa450edef68	2013-04-15 23:55:26 +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
Konstantin Shvachko	7e12ea395e	MAPREDUCE-4985. Add compression option to TestDFSIO usage. Contributed by Plamen Jeliazkov. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467146 13f79535-47bb-0310-9956-ffa450edef68	2013-04-11 23:50:15 +00:00
Vinod Kumar Vavilapalli	a84c8bcbd4	git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467130 13f79535-47bb-0310-9956-ffa450edef68	2013-04-11 23:04:09 +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
Vinod Kumar Vavilapalli	ff4b1aa99e	MAPREDUCE-5059. Change average merge time on Job overview page to be the time delta between the end of the shuffle and the start of the reduce. Contributed by Omkar Vinit Joshi. ... svn merge --ignore-ancestry -c 1467120 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467122 13f79535-47bb-0310-9956-ffa450edef68	2013-04-11 22:28:53 +00:00
Jason Darrell Lowe	74880e24c5	svn merge -c 1467061 FIXES: MAPREDUCE-5136. TestJobImpl->testJobNoTasks fails with IBM JAVA. Contributed by Amir Sanjar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467062 13f79535-47bb-0310-9956-ffa450edef68	2013-04-11 19:18:55 +00:00
Jason Darrell Lowe	9f3feed745	MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error. Contributed by Thomas Graves ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466952 13f79535-47bb-0310-9956-ffa450edef68	2013-04-11 16:29:34 +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
Vinod Kumar Vavilapalli	76d72db5eb	YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi. ... MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi. svn merge --ignore-ancestry -c 1466196 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68	2013-04-09 19:57:10 +00:00
Jason Darrell Lowe	45fa8302f4	MAPREDUCE-5086. MR app master deletes staging dir when sent a reboot command from the RM. Contributed by Jian He ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465674 13f79535-47bb-0310-9956-ffa450edef68	2013-04-08 16:12:32 +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	003ecf8137	MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey Gorshkov via tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465016 13f79535-47bb-0310-9956-ffa450edef68	2013-04-05 15:43:38 +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
Vinod Kumar Vavilapalli	523e98d914	MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth. ... svn merge --ignore-ancestry -c 1463828 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463829 13f79535-47bb-0310-9956-ffa450edef68	2013-04-03 05:40:21 +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
Bikas Saha	ad1695cb1e	Merge -c 1462271 from trunk to branch-2 for YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462274 13f79535-47bb-0310-9956-ffa450edef68	2013-03-28 19:48:52 +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
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
Hitesh Shah	c983b07753	MAPREDUCE-5083. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459935 13f79535-47bb-0310-9956-ffa450edef68	2013-03-22 19:14:07 +00:00
Siddharth Seth	7892e1aabd	merge MAPREDUCE-3872 from trunk. Fix an event handling races in ContainerLauncherImpl. Contributed by Robert Kanter. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459548 13f79535-47bb-0310-9956-ffa450edef68	2013-03-21 21:57:12 +00:00
Hitesh Shah	1de797794e	merge -c 1459040 from trunk to branch-2 to fix YARN-396. Rationalize AllocateResponse in RM Scheduler API. Contributed by Zhijie Shen. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459044 13f79535-47bb-0310-9956-ffa450edef68	2013-03-20 20:46:22 +00:00
Robert Joseph Evans	05fabc2013	svn merge -c 1458906 FIXES: MAPREDUCE-4972. Coverage fixing for org.apache.hadoop.mapreduce.jobhistory (Aleksey Gorshkov via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458915 13f79535-47bb-0310-9956-ffa450edef68	2013-03-20 16:11:58 +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
Alejandro Abdelnur	60fcbe2e05	MAPREDUCE-4990. Construct debug strings conditionally in ShuffleHandler.Shuffle#sendMapOutput(). (kkambatl via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457916 13f79535-47bb-0310-9956-ffa450edef68	2013-03-18 18:46:36 +00:00
Aaron Myers	eb6a563194	HDFS-4521. Invalid network toploogies should not be cached. Contributed by Colin Patrick McCabe. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457883 13f79535-47bb-0310-9956-ffa450edef68	2013-03-18 17:26:45 +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
Alejandro Abdelnur	3eeb720b2f	MAPREDUCE-4716. TestHsWebServicesJobsQuery.testJobsQueryStateInvalid fails with jdk7. (tgraves via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457068 13f79535-47bb-0310-9956-ffa450edef68	2013-03-15 18:58:21 +00:00
Alejandro Abdelnur	1a00fa6e3a	MAPREDUCE-4571. TestHsWebServicesJobs fails on jdk7. (tgraves via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457063 13f79535-47bb-0310-9956-ffa450edef68	2013-03-15 18:51:22 +00:00
Robert Joseph Evans	3508e8e7dd	svn merge -c 1456536 FIXES: YARN-237. Refreshing the RM page forgets how many rows I had in my Datatables (jian he via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456537 13f79535-47bb-0310-9956-ffa450edef68	2013-03-14 16:57:10 +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
Thomas Graves	d46bbdd43f	MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash via tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454157 13f79535-47bb-0310-9956-ffa450edef68	2013-03-07 23:03:10 +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
Robert Joseph Evans	611d6d543e	svn merge -c 1452372 FIXES: MAPREDUCE-5043. Fetch failure processing can cause AM event queue to backup and eventually OOM (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452451 13f79535-47bb-0310-9956-ffa450edef68	2013-03-04 19:06:26 +00:00
Jonathan Turner Eagles	a5985e4b0e	MAPREDUCE-4794. DefaultSpeculator generates error messages on normal shutdown (Jason Lowe via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451831 13f79535-47bb-0310-9956-ffa450edef68	2013-03-02 03:45:21 +00:00
Alejandro Abdelnur	6072cb98a9	MAPREDUCE-4896. mapred queue -info spits out ugly exception when queue does not exist. (sandyr via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451453 13f79535-47bb-0310-9956-ffa450edef68	2013-03-01 01:28:50 +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
Suresh Srinivas	6485664b15	HADOOP-9334. Merge change 1450463 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68	2013-02-26 22:02:30 +00:00
Thomas White	96b3905afd	Merge -r 1448614:1448615 from trunk to branch. Fixes: MAPREDUCE-4951. Container preemption interpreted as task failure. Contributed by Sandy Ryza. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448618 13f79535-47bb-0310-9956-ffa450edef68	2013-02-21 12:04:46 +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
Jonathan Turner Eagles	e3afdf5aa9	MAPREDUCE-5009. Killing the Task Attempt slated for commit does not clear the value from the Task commitAttempt member (Robert Parker via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1447969 13f79535-47bb-0310-9956-ffa450edef68	2013-02-19 23:42:40 +00:00
Alejandro Abdelnur	7f9b4c4e8b	MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446043 13f79535-47bb-0310-9956-ffa450edef68	2013-02-14 04:22:41 +00:00
Alejandro Abdelnur	1709c222d9	HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68	2013-02-14 01:36:47 +00:00
Siddharth Seth	d53d4cbca3	merge MAPREDUCE-5000 from trunk. Fixes getCounters when speculating by fixing the selection of the best attempt for a task. Contributed by Jason Lowe. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445873 13f79535-47bb-0310-9956-ffa450edef68	2013-02-13 19:23:50 +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	a6f31c1d91	svn merge -c 1445448 FIXES: MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445450 13f79535-47bb-0310-9956-ffa450edef68	2013-02-13 01:21:58 +00:00
Alejandro Abdelnur	a6925b3fdd	MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445331 13f79535-47bb-0310-9956-ffa450edef68	2013-02-12 20:16:43 +00:00
Siddharth Seth	288dd9b025	merge MAPREDUCE-4671 from trunk. AM does not tell the RM about container requests which are no longer needed. Contributed by Bikas Saha. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443324 13f79535-47bb-0310-9956-ffa450edef68	2013-02-07 07:08:30 +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
Hitesh Shah	6eead06fa2	merge -c 1441668 from trunk to branch-2 to fix YARN-372. Move InlineDispatcher from hadoop-yarn-server-resourcemanager to hadoop-yarn-common. Contributed by Siddharth Seth. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441669 13f79535-47bb-0310-9956-ffa450edef68	2013-02-02 00:45:37 +00:00
Suresh Srinivas	a83b272a36	MAPREDUCE-4969. Merge change 1441069 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441070 13f79535-47bb-0310-9956-ffa450edef68	2013-01-31 17:17:21 +00:00
Vinod Kumar Vavilapalli	a11e8bef64	MAPREDUCE-4893. Fixed MR ApplicationMaster to do optimal assignment of containers to get maximum locality. Contributed by Bikas Saha. ... svn merge --ignore-ancestry -c 1440749 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440752 13f79535-47bb-0310-9956-ffa450edef68	2013-01-31 00:29:36 +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
Siddharth Seth	6431b24f04	merge MAPREDUCE-4803 from trunk. Remove duplicate copy of TestIndexCache. Contributed by Mariappan Asokan ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439591 13f79535-47bb-0310-9956-ffa450edef68	2013-01-28 19:19:52 +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
Siddharth Seth	b981b59c06	merge MAPREDUCE-4946 from trunk. Fix a performance problem for large jobs by reducing the number of map completion event type conversions. Contributed by Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437104 13f79535-47bb-0310-9956-ffa450edef68	2013-01-22 19:08:06 +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
Siddharth Seth	f18bb1a150	merge MAPREDUCE-4948 from trunk. Fix a failing unit test - TestYARNRunner.testHistoryServerToken. Contributed by Junping Du ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435313 13f79535-47bb-0310-9956-ffa450edef68	2013-01-18 19:31:10 +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
Alejandro Abdelnur	2e2afd22f9	MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433759 13f79535-47bb-0310-9956-ffa450edef68	2013-01-16 00:15:59 +00:00
Siddharth Seth	44b3be14bc	merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68	2013-01-15 18:35:10 +00:00
Jason Darrell Lowe	3943008b07	svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433446 13f79535-47bb-0310-9956-ffa450edef68	2013-01-15 14:49:14 +00:00
Suresh Srinivas	1b410df23f	MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68	2013-01-15 00:13:43 +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
Jason Darrell Lowe	fb0a8ff926	svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68	2013-01-09 23:01:11 +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
Arun Murthy	b412841745	Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced CapacityScheduler to account for CPU alongwith memory for multi-dimensional resource scheduling. Contributed by Arun C. Murthy. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430683 13f79535-47bb-0310-9956-ffa450edef68	2013-01-09 05:17:31 +00:00
Thomas Graves	8c9b47c29e	MAPREDUCE-4899 fix branch-2 merge issue in pom ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430470 13f79535-47bb-0310-9956-ffa450edef68	2013-01-08 19:53:32 +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
Vinod Kumar Vavilapalli	9a87b2f7fe	MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas. ... svn merge --ignore-ancestry -c 1429751 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68	2013-01-07 11:15:10 +00:00
Thomas Graves	b035a444e1	MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally exits (Jason Lowe via tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429376 13f79535-47bb-0310-9956-ffa450edef68	2013-01-05 20:19:18 +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	6862511182	svn merge -c 1428482 FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68	2013-01-03 17:21:27 +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
Vinod Kumar Vavilapalli	121a79c7a1	MAPREDUCE-4899. Implemented a MR specific plugin for tracking finished applications that YARN's ResourceManager doesn't keep track off anymore. Contributed by Derek Dagit. ... svn merge --ignore-ancestry -c 1425225 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425226 13f79535-47bb-0310-9956-ffa450edef68	2012-12-22 01:49:02 +00:00
Jason Darrell Lowe	5b6115e3bb	svn merge -c 1425223 FIXES: MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while speculating. Contributed by Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425224 13f79535-47bb-0310-9956-ffa450edef68	2012-12-22 01:46:05 +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	043fd00a30	svn merge -c 1425167 FIXES: MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP. Contributed by Robert Parker ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425168 13f79535-47bb-0310-9956-ffa450edef68	2012-12-21 22:34:41 +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
Thomas White	fc70cd9538	Merge -r 1420633:1420634 from trunk to branch-2. Fixes: MAPREDUCE-4856. TestJobOutputCommitter uses same directory as TestJobCleanup. Contributed by Sandy Ryza. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420635 13f79535-47bb-0310-9956-ffa450edef68	2012-12-12 12:14:08 +00:00
Alejandro Abdelnur	1fce56fd24	MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68	2012-12-11 19:50:32 +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
Jason Darrell Lowe	e2c0cf69ca	svn merge -c 1420232 FIXES: YARN-266. RM and JHS Web UIs are blank because AppsBlock is not escaping string properly. Contributed by Ravi Prakash ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420233 13f79535-47bb-0310-9956-ffa450edef68	2012-12-11 15:51:12 +00:00
Alejandro Abdelnur	89b9fc3034	MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using the configurations used before it is being stopped. (ahmed.radwan via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419619 13f79535-47bb-0310-9956-ffa450edef68	2012-12-10 18:10:22 +00:00
Jonathan Turner Eagles	77933c6327	MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0. (Ravi Prakash via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415863 13f79535-47bb-0310-9956-ffa450edef68	2012-11-30 21:51:38 +00:00
Thomas Graves	b432cf076e	merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414876 13f79535-47bb-0310-9956-ffa450edef68	2012-11-28 19:24:27 +00:00
Robert Joseph Evans	3e0d0cf08f	svn merge -c 1414840 FIXES: MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state (jlowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414842 13f79535-47bb-0310-9956-ffa450edef68	2012-11-28 17:54:10 +00:00
Robert Joseph Evans	ff97561e05	svn merge -c 1413739 FIXES: MAPREDUCE-4764. repair TestBinaryTokenFile (Ivan A. Veselovsky via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1413741 13f79535-47bb-0310-9956-ffa450edef68	2012-11-26 17:38:53 +00:00
Jason Darrell Lowe	6e6b09dfba	svn merge -c 1412377 FIXES: MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI About page. Contributed by Ravi Prakash ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412378 13f79535-47bb-0310-9956-ffa450edef68	2012-11-22 00:11:02 +00:00
Siddharth Seth	fa6b7fca7a	merge MAPREDUCE-4723 amendment from trunk. Fix JobHistory Event handling. (Contributed by Sandy Ryza) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411293 13f79535-47bb-0310-9956-ffa450edef68	2012-11-19 16:44:28 +00:00
Thomas White	db8545d924	Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68	2012-11-19 15:16:57 +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
Robert Joseph Evans	19748556f8	svn merge -c 1410498 FIXES: MAPREDUCE-4802. Takes a long time to load the task list on the AM for large jobs (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410502 13f79535-47bb-0310-9956-ffa450edef68	2012-11-16 17:32:31 +00:00
Robert Joseph Evans	34abf278dd	svn merge -c 1410131 FIXES: MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely closed channels (jlowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410132 13f79535-47bb-0310-9956-ffa450edef68	2012-11-16 00:55:56 +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	c26bf3b838	svn merge -c 1409580 FIXES: MAPREDUCE-4720. Browser thinks History Server main page JS is taking too long (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409583 13f79535-47bb-0310-9956-ffa450edef68	2012-11-15 00:02:52 +00:00
Robert Joseph Evans	3b9bb65473	svn merge -c 1409525 FIXES: MAPREDUCE-4797. LocalContainerAllocator can loop forever trying to contact the RM (jlowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409528 13f79535-47bb-0310-9956-ffa450edef68	2012-11-14 23:06:48 +00:00
Jason Darrell Lowe	8ca6059743	svn merge -c 1409313 FIXES: YARN-216. Remove jquery theming support. Contributed by Robert Joseph Evans. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409314 13f79535-47bb-0310-9956-ffa450edef68	2012-11-14 19:26:54 +00:00
Thomas Graves	6a743f3f5b	merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409034 13f79535-47bb-0310-9956-ffa450edef68	2012-11-13 23:49:04 +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	ec861244a2	svn merge -c 1408360 FIXES: MAPREDUCE-4425. Speculation + Fetch failures can lead to a hung job (jlowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408361 13f79535-47bb-0310-9956-ffa450edef68	2012-11-12 17:19:58 +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
Robert Joseph Evans	74656788e5	svn merge -c 1408314 FIXES: MAPREDUCE-4751. AM stuck in KILL_WAIT for days (vinodkv via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408316 13f79535-47bb-0310-9956-ffa450edef68	2012-11-12 15:19:41 +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	b8f37b3b36	svn merge -c 1407679 FIXES: MAPREDUCE-4774. JobImpl does not handle asynchronous task events in FAILED state (jlowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407682 13f79535-47bb-0310-9956-ffa450edef68	2012-11-09 23:00:57 +00:00
Jonathan Turner Eagles	1d58a7b5b3	MAPREDUCE-4666. JVM metrics for history server. (jlowe via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407670 13f79535-47bb-0310-9956-ffa450edef68	2012-11-09 22:22:16 +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
Thomas White	501b2758ce	Merge -r 1406644:1406645 from trunk to branch-2. Fixes: MAPREDUCE-4777. In TestIFile, testIFileReaderWithCodec relies on testIFileWriterWithCodec. Contributed by Sandy Ryza ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406647 13f79535-47bb-0310-9956-ffa450edef68	2012-11-07 14:12:55 +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	11822fb8ab	svn merge -c 1404988 FIXES: MAPREDUCE-4763 repair test TestUmbilicalProtocolWithJobToken (Ivan A. Veselovsky via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404991 13f79535-47bb-0310-9956-ffa450edef68	2012-11-02 15:05:06 +00:00
Jason Darrell Lowe	a280cd5567	svn merge -c 1404817 FIXES: MAPREDUCE-4729. job history UI not showing all job attempts. Contributed by Vinod Kumar Vavilapalli ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404824 13f79535-47bb-0310-9956-ffa450edef68	2012-11-01 23:05:53 +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
Robert Joseph Evans	9d689a9db9	svn merge -c 1404305 FIXES: MAPREDUCE-4724. job history web ui applications page should be sorted to display last app first (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404306 13f79535-47bb-0310-9956-ffa450edef68	2012-10-31 19:13:59 +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
Jason Darrell Lowe	58c43cc8cb	svn merge -c 1402658 FIXES: MAPREDUCE-4748. Invalid event: T_ATTEMPT_SUCCEEDED at SUCCEEDED. Contributed by Jason Lowe ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402664 13f79535-47bb-0310-9956-ffa450edef68	2012-10-26 21:05:33 +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
Jason Darrell Lowe	33cb0be07c	svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401741 13f79535-47bb-0310-9956-ffa450edef68	2012-10-24 15:47:01 +00:00
Jason Darrell Lowe	b702473f5c	svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401729 13f79535-47bb-0310-9956-ffa450edef68	2012-10-24 15:25:22 +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
Siddharth Seth	5d200b2ab3	merge MAPREDUCE-4637 from trunk. Handle TaskAttempt diagnostic updates while in the NEW and UNASSIGNED states. (Contributed by Mayank Bansal) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401475 13f79535-47bb-0310-9956-ffa450edef68	2012-10-23 21:03:17 +00:00
Jason Darrell Lowe	43159cc20d	svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68	2012-10-22 19:58:01 +00:00
Vinod Kumar Vavilapalli	3d8fa1d6c4	MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe. ... svn merge --ignore-ancestry -c 1400264 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68	2012-10-19 20:20:03 +00:00
Robert Joseph Evans	edd3bc5cc2	svn merge -c 1400192 FIXES: MAPREDUCE-4479. Fix parameter order in assertEquals() in TestCombineInputFileFormat.java (Mariappan Asokan via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400194 13f79535-47bb-0310-9956-ffa450edef68	2012-10-19 17:53:18 +00:00
Vinod Kumar Vavilapalli	5944b1c703	MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1399976 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68	2012-10-19 05:59:25 +00:00
Robert Joseph Evans	070ae0d73e	svn merge -c 1399289 FIXES: MAPREDUCE-4721. Task startup time in JHS is same as job startup time. (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399291 13f79535-47bb-0310-9956-ffa450edef68	2012-10-17 15:01:10 +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
Suresh Srinivas	3a9aadc3c7	HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397435 13f79535-47bb-0310-9956-ffa450edef68	2012-10-12 04:48:40 +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
Siddharth Seth	7e55280b5b	merge MAPREDUCE-4705 from trunk. Fix a bug in job history lookup, which makes older jobs inaccessible despite the presence of a valid history file. (Contributed by Jason Lowe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395851 13f79535-47bb-0310-9956-ffa450edef68	2012-10-09 03:24:43 +00:00
Siddharth Seth	b98a3a3787	merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68	2012-10-09 01:58:07 +00:00
Robert Joseph Evans	09f0aee7f8	svn merge -c 1395769 FIXES: MAPREDUCE-4554. Job Credentials are not transmitted if security is turned off (Benoy Antony via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395772 13f79535-47bb-0310-9956-ffa450edef68	2012-10-08 20:55:21 +00:00
Robert Joseph Evans	81b14fae80	svn merge -c 1391679 FIXES: MAPREDUCE-4689. JobClient.getMapTaskReports on failed job results in NPE (jlowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391680 13f79535-47bb-0310-9956-ffa450edef68	2012-09-28 22:18:32 +00:00
Jason Darrell Lowe	f40997309e	svn merge -c 1391671 FIXES: MAPREDUCE-4691. Historyserver can report "Unknown job" after RM says job has completed. Contributed by Robert Joseph Evans. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391675 13f79535-47bb-0310-9956-ffa450edef68	2012-09-28 22:00:42 +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 Graves	e5e1887092	merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68	2012-09-26 15:25:05 +00:00
Arun Murthy	6667d885bb	Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390226 13f79535-47bb-0310-9956-ffa450edef68	2012-09-25 23:50:03 +00:00
Konstantin Shvachko	1aba4503cf	MAPREDUCE-4651. Benchmarking random reads with DFSIO. Contributed by Konstantin Shvachko. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390161 13f79535-47bb-0310-9956-ffa450edef68	2012-09-25 21:36:30 +00:00
Konstantin Shvachko	7cf9362055	MAPREDUCE-4645. Provide a random seed to Slive to make the sequence of file names deterministic. Contributed by Ravi Prakash. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389595 13f79535-47bb-0310-9956-ffa450edef68	2012-09-24 21:17:29 +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
Aaron Myers	ac103a4314	HADOOP-8755. Print thread dump when tests fail due to timeout. Contributed by Andrey Klochkov. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384628 13f79535-47bb-0310-9956-ffa450edef68	2012-09-14 01:50:35 +00:00
Vinod Kumar Vavilapalli	a5e50dfae9	MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe. ... svn merge --ignore-ancestry -c 1383709 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68	2012-09-12 00:59:59 +00:00
Eli Collins	8644881db7	HDFS-3910. DFSTestUtil#waitReplication should timeout. Contributed by Eli Collins ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383619 13f79535-47bb-0310-9956-ffa450edef68	2012-09-11 21:28:53 +00:00
Thomas White	803905eb5a	Merge -r 1383421:1383422 from trunk to branch-2. Fixes: MAPREDUCE-4607. Race condition in ReduceTask completion can result in Task being incorrectly failed. Contributed by Bikas Saha. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383425 13f79535-47bb-0310-9956-ffa450edef68	2012-09-11 14:13:58 +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
Alejandro Abdelnur	2cdffe63d5	MAPREDUCE-4642. MiniMRClientClusterFactory should not use job.setJar() (rkanter via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382094 13f79535-47bb-0310-9956-ffa450edef68	2012-09-07 17:06:55 +00:00
Robert Joseph Evans	ebb1a16f62	svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68	2012-09-07 16:47:04 +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
Robert Joseph Evans	928e6864d3	svn merge -c 1381784 FIXES: MAPREDUCE-4641. Exception in commitJob marks job as successful in job history (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381786 13f79535-47bb-0310-9956-ffa450edef68	2012-09-06 22:22:01 +00:00
Robert Joseph Evans	2616974383	svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68	2012-09-06 14:22:04 +00:00
Eli Collins	515dfba075	Fix MAPREDUCE-4580 build breakage. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381316 13f79535-47bb-0310-9956-ffa450edef68	2012-09-05 19:36:28 +00:00
Konstantin Shvachko	54ca8b837c	MAPREDUCE-2786. Add compression option for TestDFSIO. Contributed by Plamen Jeliazkov. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380308 13f79535-47bb-0310-9956-ffa450edef68	2012-09-03 18:50:28 +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
Thomas Graves	c54a74a2cc	merge -r 1379598:1379599 from trunk. FIXES: MAPREDUCE-4611 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379602 13f79535-47bb-0310-9956-ffa450edef68	2012-08-31 20:45:34 +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	b2382b0cd4	svn merge -c 1379584 FIXES: MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379585 13f79535-47bb-0310-9956-ffa450edef68	2012-08-31 20:26:26 +00:00
Vinod Kumar Vavilapalli	e591c4f4dc	MAPREDUCE-4569. Fixed TestHsWebServicesJobsQuery to pass on JDK7 by not depending on test order. Contributed by Thomas Graves. ... svn merge --ignore-ancestry -c 1379146 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379148 13f79535-47bb-0310-9956-ffa450edef68	2012-08-30 21:04:05 +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
Thomas White	ebbb304022	Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378874 13f79535-47bb-0310-9956-ffa450edef68	2012-08-30 10:02:31 +00:00
Vinod Kumar Vavilapalli	14b1cf459b	MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves. ... svn merge --ignore-ancestry -c 1377943 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377944 13f79535-47bb-0310-9956-ffa450edef68	2012-08-28 02:05:25 +00:00
Siddharth Seth	a1c556ca19	merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68	2012-08-28 00:41:03 +00:00
Siddharth Seth	bf08346d3c	merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68	2012-08-25 02:25:12 +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
Aaron Myers	0490537635	MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks() test. Contributed by Aaron T. Myers. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376298 13f79535-47bb-0310-9956-ffa450edef68	2012-08-22 22:45:30 +00:00
Alejandro Abdelnur	d7a90bc552	MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68	2012-08-22 21:23:09 +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
Thomas Graves	e94632c765	merge -r 1374423:1374424 from trunk. FIXES: YARN-25 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374425 13f79535-47bb-0310-9956-ffa450edef68	2012-08-17 20:31:09 +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
Arun Murthy	92a99de731	Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68	2012-08-08 05:33:56 +00:00
Alejandro Abdelnur	2a178a8d0b	Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68	2012-08-06 18:15:35 +00:00
Jonathan Turner Eagles	054dd2d39c	svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68	2012-08-03 20:42:18 +00:00
Siddharth Seth	f7545f076e	Merge MAPREDUCE-3289 from trunk. Make use of fadvise in the NM's shuffle handler. (Contributed by Todd Lipcon and Siddharth Seth) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368722 13f79535-47bb-0310-9956-ffa450edef68	2012-08-02 21:57:42 +00:00
Thomas Graves	6b3c8934f3	merge -r 1368293:1368294 from trunk. FIXES: MAPREDUCE-4504 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368296 13f79535-47bb-0310-9956-ffa450edef68	2012-08-01 22:20:59 +00:00
Jonathan Turner Eagles	d40b6be2f5	svn merge -c 1367789 FIXES: MAPREDUCE-4234. SortValidator.java is incompatible with multi-user or parallel use (due to a /tmp file with static name) (Robert Evans via jeagles) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367793 13f79535-47bb-0310-9956-ffa450edef68	2012-07-31 21:45:45 +00:00
Thomas Graves	66d468eece	merge -r 1367770:1367771 from trunk. FIXES: MAPREDUCE-4457 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367772 13f79535-47bb-0310-9956-ffa450edef68	2012-07-31 20:53:45 +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
Robert Joseph Evans	6fe821a14a	svn merge -c 1367601 FIXES: MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367602 13f79535-47bb-0310-9956-ffa450edef68	2012-07-31 15:09:49 +00:00
Thomas Graves	a1a7ee23f7	merge -r 1367580:1367581 from trunk. FIXES: MAPREDUCE-4456 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367585 13f79535-47bb-0310-9956-ffa450edef68	2012-07-31 14:49:07 +00:00
Thomas Graves	ca7732aae9	merge -r 1367538:1367539 from trunk. FIXES: MAPREDUCE-4375 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367540 13f79535-47bb-0310-9956-ffa450edef68	2012-07-31 13:40:39 +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
Alejandro Abdelnur	3298bb541c	Merge -r 1364019:1364020 from trunk to branch. FIXES: MAPREDUCE-987 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1364117 13f79535-47bb-0310-9956-ffa450edef68	2012-07-21 16:26:00 +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
Alejandro Abdelnur	bd359a1a8e	Merge -r 1362750:1362751 from trunk to branch. FIXES: MAPREDUCE-4406 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362752 13f79535-47bb-0310-9956-ffa450edef68	2012-07-18 03:37:38 +00:00
Alejandro Abdelnur	c22cddbad1	Merge -r 1362721:1362722 from trunk to branch. FIXES: MAPREDUCE-4422 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362723 13f79535-47bb-0310-9956-ffa450edef68	2012-07-17 23:34:38 +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	71b35e827c	svn merge -c 1362608 FIXES: MAPREDUCE-4283. Display tail of aggregated logs by default (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362609 13f79535-47bb-0310-9956-ffa450edef68	2012-07-17 19:08:26 +00:00