605 Commits

Author	SHA1	Message	Date
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
Robert Joseph Evans	796272a502	svn merge -c 1362495 FIXES: MAPREDUCE-4449. Incorrect MR_HISTORY_STORAGE property name in JHAdminConfig (Ahmed Radwan via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362496 13f79535-47bb-0310-9956-ffa450edef68	2012-07-17 13:51:52 +00:00
Robert Joseph Evans	0d1867fa9d	svn merge -c 1362209 FIXES: MAPREDUCE-4437. Race in MR ApplicationMaster can cause reducers to never be scheduled (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362213 13f79535-47bb-0310-9956-ffa450edef68	2012-07-16 19:13:10 +00:00
Arun Murthy	4902c6bdc9	Merge -c 1361813 from trunk to branch-2 to fix MAPREDUCE-4427. Added an 'unmanaged' mode for AMs so as to ease development of new applications. Contributed by Bikas Saha. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361815 13f79535-47bb-0310-9956-ffa450edef68	2012-07-15 21:47:53 +00:00
Robert Joseph Evans	3260960be3	svn merge -c 1361389 FIXES: MAPREDUCE-4419. ./mapred queue -info <queuename> -showJobs displays all the jobs irrespective of <queuename> (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361391 13f79535-47bb-0310-9956-ffa450edef68	2012-07-13 20:45:05 +00:00
Harsh J	f457ffb05b	Backport of MAPREDUCE-4432 from trunk. Confusing warning message when GenericOptionsParser is not used. Contributed by Gabriel Reid. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361275 13f79535-47bb-0310-9956-ffa450edef68	2012-07-13 15:23:09 +00:00
Robert Joseph Evans	75af3cba6b	svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68	2012-07-12 15:53:38 +00:00
Harsh J	91472c5539	Backport of HADOOP-3886 from trunk. svn merge -c 1360222 ../../trunk (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360224 13f79535-47bb-0310-9956-ffa450edef68	2012-07-11 15:07:34 +00:00
Vinod Kumar Vavilapalli	60ad1056af	MAPREDUCE-3940. ContainerTokens should have an expiry interval. Contributed by Siddharth Seth and Vinod Kumar Vavilapalli. ... svn merge -c 1359910 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359912 13f79535-47bb-0310-9956-ffa450edef68	2012-07-10 21:33:04 +00:00
Robert Joseph Evans	aaea868826	svn merge -c 1359747. FIXES: MAPREDUCE-4252. MR2 job never completes with 1 pending task (Tom White via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359749 13f79535-47bb-0310-9956-ffa450edef68	2012-07-10 16:11:23 +00:00
Thomas Graves	5ecf46efb6	merge -r 1359398:1359399 from trunk. FIXES: MAPREDUCE-4300 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359400 13f79535-47bb-0310-9956-ffa450edef68	2012-07-09 21:10:09 +00:00
Alejandro Abdelnur	3097c15d9d	Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68	2012-07-09 19:19:42 +00:00
Robert Joseph Evans	2353571c64	svn merge -c 1359252 FIXES: MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359253 13f79535-47bb-0310-9956-ffa450edef68	2012-07-09 16:15:12 +00:00
Harsh J	41553468b1	Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68	2012-07-09 02:02:53 +00:00
Harsh J	b035a14d58	Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68	2012-07-08 17:24:38 +00:00
Thomas Graves	ca78b62579	merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68	2012-07-05 21:37:53 +00:00
Robert Joseph Evans	93f425a659	svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68	2012-07-05 18:10:51 +00:00
Alejandro Abdelnur	c25a45dc52	Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68	2012-07-05 16:33:34 +00:00
Harsh J	f62de1d81e	svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68	2012-06-30 17:11:46 +00:00
Robert Joseph Evans	b38f46e73c	svn merge -c 1355124 FIXES: MAPREDUCE-4376. TestClusterMRNotification times out (Kihwal Lee via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355125 13f79535-47bb-0310-9956-ffa450edef68	2012-06-28 19:30:22 +00:00
Alejandro Abdelnur	0b4c8a5875	Reverting MAPREDUCE-4346 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68	2012-06-27 18:33:38 +00:00
Robert Joseph Evans	4bb61ecbd7	svn merge -c 1354181 FIXES: MAPREDUCE-4228. mapreduce.job.reduce.slowstart.completedmaps is not working properly (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354182 13f79535-47bb-0310-9956-ffa450edef68	2012-06-26 19:18:49 +00:00
Alejandro Abdelnur	df2f723a75	Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68	2012-06-25 22:01:01 +00:00
Alejandro Abdelnur	d21c6aa52f	Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68	2012-06-25 21:37:14 +00:00
Siddharth Seth	09ac40f800	Merge MAPREDUCE-4290 from trunk. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353685 13f79535-47bb-0310-9956-ffa450edef68	2012-06-25 17:56:11 +00:00
Robert Joseph Evans	f63255faec	svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68	2012-06-20 21:32:21 +00:00
Siddharth Seth	2846979f16	Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68	2012-06-11 23:16:08 +00:00
Thomas White	f323ea705d	Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68	2012-06-11 20:39:13 +00:00
Thomas Graves	4159a21d28	merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68	2012-06-11 13:57:15 +00:00
Thomas Graves	d1607ba557	merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68	2012-06-08 15:51:21 +00:00
Thomas Graves	3dc10a25d9	merge -r 1346046:1346047 from trunk. FIXES: MAPREDUCE-3350 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346048 13f79535-47bb-0310-9956-ffa450edef68	2012-06-04 17:42:45 +00:00
Thomas Graves	c59349ede3	merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68	2012-06-04 15:15:13 +00:00
Robert Joseph Evans	ed20ba2e49	svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68	2012-05-30 14:52:39 +00:00
Harsh J	4200fa906e	svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68	2012-05-29 16:15:25 +00:00
Thomas White	5e473c9c6e	Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68	2012-05-29 14:45:25 +00:00
Harsh J	1f804b5d20	svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68	2012-05-28 14:58:13 +00:00
Robert Joseph Evans	1586e827ed	i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68	2012-05-21 19:07:13 +00:00
Alejandro Abdelnur	00875b37f6	HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 19:46:30 +00:00
Thomas Graves	a1ce7813e9	merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 14:10:35 +00:00
Robert Joseph Evans	5922f4f064	svn merge -c 1337363 FIXES: MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337364 13f79535-47bb-0310-9956-ffa450edef68	2012-05-11 20:27:58 +00:00
Thomas White	dc576b9fa1	Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68	2012-05-11 15:04:24 +00:00
Robert Joseph Evans	c35e442b1b	svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 15:26:11 +00:00
Robert Joseph Evans	4bc2774d79	svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 15:10:03 +00:00
Thomas White	f1e31ebaf2	Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68	2012-05-07 19:07:29 +00:00
Robert Joseph Evans	13acee63d3	svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68	2012-05-04 15:04:08 +00:00
Alejandro Abdelnur	9a04fc6caf	Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68	2012-05-04 03:21:15 +00:00
Robert Joseph Evans	c9aac0a1d1	svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68	2012-05-03 18:37:01 +00:00
Robert Joseph Evans	5765eb1868	svn merge -c 1332716. FIXES: MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332719 13f79535-47bb-0310-9956-ffa450edef68	2012-05-01 16:02:31 +00:00
Thomas Graves	1a17df6b21	merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68	2012-05-01 14:11:31 +00:00
Robert Joseph Evans	f17cf45efe	svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332227 13f79535-47bb-0310-9956-ffa450edef68	2012-04-30 14:49:43 +00:00
Thomas White	e5e15fab74	Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68	2012-04-26 18:48:13 +00:00
Thomas Graves	bb9cfbb052	merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68	2012-04-25 21:14:13 +00:00
Thomas Graves	f8f390b83d	merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68	2012-04-24 13:07:22 +00:00
Alejandro Abdelnur	37026cea83	Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 22:33:51 +00:00
Robert Joseph Evans	88d736ce2b	svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 19:46:16 +00:00
Robert Joseph Evans	1fca6cfe03	svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 19:39:43 +00:00
Robert Joseph Evans	1ea39ddc3c	svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 15:28:19 +00:00
Robert Joseph Evans	0c244e8703	svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:36:47 +00:00
Alejandro Abdelnur	479e5b0102	Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:34:49 +00:00
Robert Joseph Evans	8f4c3499f5	svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:24:45 +00:00
Robert Joseph Evans	eec2fd9f74	MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 19:33:04 +00:00
Robert Joseph Evans	a18ad09c94	svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 16:23:35 +00:00
Thomas Graves	7221ae82e5	merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 14:54:03 +00:00
Robert Joseph Evans	461b330ebf	svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68	2012-04-18 18:48:20 +00:00
Siddharth Seth	be7e487ef3	Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68	2012-04-18 02:01:02 +00:00
Robert Joseph Evans	45b2835e9f	svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68	2012-04-17 22:13:52 +00:00
Robert Joseph Evans	8ca897dea2	svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68	2012-04-13 13:46:45 +00:00
Siddharth Seth	d550503dbb	Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68	2012-04-12 18:41:09 +00:00
Thomas White	cb3d6c3d98	Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68	2012-04-12 16:31:15 +00:00
Thomas Graves	d31abfe3f8	merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 21:14:55 +00:00
Siddharth Seth	462f9a5249	MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 18:20:08 +00:00
Siddharth Seth	50c13a44af	merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 17:11:34 +00:00
Siddharth Seth	40497a9d04	merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 02:52:13 +00:00
Thomas Graves	15d3d52f1b	merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 22:10:34 +00:00
Robert Joseph Evans	b04f23fc96	svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 20:37:13 +00:00
Robert Joseph Evans	07321a677c	svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 18:59:03 +00:00
Thomas Graves	ce9bdceac7	merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 18:13:09 +00:00
Robert Joseph Evans	f9e39d057e	svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68	2012-04-09 21:54:22 +00:00
Robert Joseph Evans	ea165d6e91	svn merge -c 1310546 FIXES: MAPREDUCE-4110. Fix tests in TestMiniMRClasspath & TestMiniMRWithDFSWithDistinctUsers (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310547 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 18:57:44 +00:00
Robert Joseph Evans	6514ecce13	svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 16:05:36 +00:00
Robert Joseph Evans	cbbddcb3ca	svn merge -c 1310418 from trunk. FIXES: MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310421 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 15:58:36 +00:00
Robert Joseph Evans	7c087c4a9b	svn merge -c 1310409 from trunk. FIXES: MAPREDUCE-4113. Fix tests org.apache.hadoop.mapred.TestClusterMRNotification (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310412 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 15:51:07 +00:00
Thomas Graves	0d388cd1f4	merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68	2012-04-05 20:13:11 +00:00
Alejandro Abdelnur	98f0abb721	Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 20:25:18 +00:00
Thomas Graves	378ed9b673	merge -r 1309439:1309440 from trunk. FIXES: MAPREDUCE-3682 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309446 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 15:12:24 +00:00
Alejandro Abdelnur	4bdf14f6c9	Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 14:57:41 +00:00
Thomas Graves	93af1a43be	merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 14:18:55 +00:00
Robert Joseph Evans	8b39213000	svn merge -c 1309086 from trunk. FIXES MAPREDUCE-3988. mapreduce.job.local.dir doesn't point to a single directory on a node. (Eric Payne via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309087 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 18:30:38 +00:00
Robert Joseph Evans	e76f7b7330	svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 18:03:18 +00:00
Robert Joseph Evans	c6c7055c83	MAPREDUCE-4062. AM Launcher thread can hang forever (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309044 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 17:03:53 +00:00
Robert Joseph Evans	97f328dc40	svn merge -c 1308566 from trunk. FIXES MAPREDUCE-4024. RM webservices can't query on finalStatus (Tom Graves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308568 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 21:07:47 +00:00
Thomas Graves	ad9f93f7b5	merge -r 1308530:1308531 from trunk. FIXES: MAPREDUCE-4089 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308533 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 20:24:46 +00:00
Robert Joseph Evans	54a0b26231	svn merge -c 1308507 from trunk FIXES: MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308509 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 19:54:46 +00:00
Alejandro Abdelnur	c1ccd60f74	Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68	2012-03-30 21:31:34 +00:00
Alejandro Abdelnur	4805df8366	Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 21:50:30 +00:00
Robert Joseph Evans	581f9b4ca2	svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306905 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 15:20:06 +00:00
Arun Murthy	96d4812433	Merge -c 1306736 from trunk to branch-2 to fix MAPREDUCE-3377. Added a unit test to ensure OutputCommitter.checkOutputSpecs is called prior to copying job.xml. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306737 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 07:47:55 +00:00
Siddharth Seth	55639bea52	Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 02:04:21 +00:00
Arun Murthy	3e8925aa92	Changed version in branch-2 to 2.0.0-SNAPSHOT. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68	2012-03-28 07:25:51 +00:00
Robert Joseph Evans	e7ec8a44b6	svn merge -c 1305607 trunk to branch-0.23 FIXES: MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305608 13f79535-47bb-0310-9956-ffa450edef68	2012-03-26 21:25:16 +00:00
Harsh J	92f06cb446	svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68	2012-03-26 13:31:08 +00:00
Robert Joseph Evans	1f3e5ebc0b	svn merge -c 1304587 from trunk to branch-0.23 FIXES: MAPREDUCE-4043. Secret keys set in Credentials are not seen by tasks (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304593 13f79535-47bb-0310-9956-ffa450edef68	2012-03-23 20:52:42 +00:00
Todd Lipcon	4ab173a9d4	MAPREDUCE-3992. Reduce fetcher doesn't verify HTTP status code of response. Contributed by Todd Lipcon. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302755 13f79535-47bb-0310-9956-ffa450edef68	2012-03-20 02:29:01 +00:00
Robert Joseph Evans	c02c9218d9	svn merge -c 1302645 from trunk to branch-0.23 FIXES MAPREDUCE-4025. AM can crash if task attempt reports bogus progress value (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302646 13f79535-47bb-0310-9956-ffa450edef68	2012-03-19 20:32:54 +00:00
Robert Joseph Evans	4c0306714b	svn merge -c 1301551 from trunk to branch-0.23 FIXES MAPREDUCE-4010. TestWritableJobConf fails on trunk (tucu via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301553 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 14:40:32 +00:00
Alejandro Abdelnur	fbae7714cf	Merge -r 1300749:1300750 from trunk to branch. FIXES: MAPREDUCE-4007 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300751 13f79535-47bb-0310-9956-ffa450edef68	2012-03-14 22:03:32 +00:00
Vinod Kumar Vavilapalli	07e7ad5e86	MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. Contributed by Robert Joseph Evans. ... svn merge --ignore-ancestry -c 1299047 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299048 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 21:14:28 +00:00
Vinod Kumar Vavilapalli	c383843732	MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer correctly when RM forgets the app. Contributed by Devaraj K. ... svn merge --ignore-ancestry -c 1298978 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298979 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 18:55:02 +00:00
Robert Joseph Evans	b6d9e6b5f7	svn merge -c 1297825 from trunk to branch-0.23 FIXES: MAPREDUCE-3975. Default value not set for Configuration parameter mapreduce.job.local.dir (Eric Payne via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297826 13f79535-47bb-0310-9956-ffa450edef68	2012-03-07 01:28:34 +00:00
Robert Joseph Evans	de89bbcb88	svn merge -c 1297788 from trunk to branch-0.23 FIXES: MAPREDUCE-3961. Map/ReduceSlotMillis computation incorrect (Siddharth Seth via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297789 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 23:23:25 +00:00
Siddharth Seth	084f085b5f	merge MAPREDUCE-3944 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297673 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 19:53:09 +00:00
Tsz-wo Sze	74360b15d3	HADOOP-8142. Update versions from 0.23.2 to 0.23.3 in the build files. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297650 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 18:53:46 +00:00
Robert Joseph Evans	a7a9d16d63	svn merge -c 1297557 from trunk to branch-0.23 FIXES: MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297558 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 16:19:10 +00:00
Alejandro Abdelnur	a7899dae53	Merge -r 1297292:1297293 from trunk to branch. FIXES: MAPREDUCE-3952 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297299 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 00:00:36 +00:00
Vinod Kumar Vavilapalli	1719df92ab	MAPREDUCE-3009. Fixed node link on JobHistory webapp. Contributed by Chackaravarthy. ... svn merge --ignore-ancestry -c 1297149 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297150 13f79535-47bb-0310-9956-ffa450edef68	2012-03-05 18:31:23 +00:00
Vinod Kumar Vavilapalli	526f466d0c	MAPREDUCE-3614. Fixed MR AM to close history file quickly and send a correct final state to the RM when it is killed. Contributed by Ravi Prakash. ... svn merge --ignore-ancestry -c 1296747 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296748 13f79535-47bb-0310-9956-ffa450edef68	2012-03-04 05:25:07 +00:00
Vinod Kumar Vavilapalli	f942f395c1	MAPREDUCE-3792. Fix "bin/mapred job -list" to display all jobs instead of only the jobs owned by the user. Contributed by Jason Lowe. ... svn merge --ignore-ancestry -c 1296721 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296724 13f79535-47bb-0310-9956-ffa450edef68	2012-03-03 23:42:39 +00:00
Thomas White	100d542625	Merge -r 1296522:1296523 from trunk to branch-23. Fixes: MAPREDUCE-3935. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296524 13f79535-47bb-0310-9956-ffa450edef68	2012-03-03 00:12:55 +00:00
Siddharth Seth	3e3e6770ca	merge MAPREDUCE-3896 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296402 13f79535-47bb-0310-9956-ffa450edef68	2012-03-02 19:29:14 +00:00
Siddharth Seth	c471c3d15f	merge MAPREDUCE-3903 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295263 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 20:50:02 +00:00
Thomas Graves	90c6dd8468	merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 15:51:55 +00:00
Vinod Kumar Vavilapalli	7808418f74	MAPREDUCE-2855. Passing a cached class-loader to ResourceBundle creator to minimize counter names lookup time. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1294436 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294437 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 01:25:46 +00:00
Vinod Kumar Vavilapalli	5240af9d20	MAPREDUCE-3901. Modified JobHistory records in YARN to lazily load job and task reports so as to improve UI response times. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1294417 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294421 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 00:35:12 +00:00
Tsz-wo Sze	def75f7560	Merge r1293501 through r1293896 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68	2012-02-26 17:58:14 +00:00
Vinod Kumar Vavilapalli	3904d62d18	MAPREDUCE-3686. Fixed two bugs in Counters because of which web app displays zero counter values for framework counters. Contributed by Bhallamudi Venkata Siva Kamesh. ... svn merge --ignore-ancestry -c 1293775 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293776 13f79535-47bb-0310-9956-ffa450edef68	2012-02-26 08:33:34 +00:00
Vinod Kumar Vavilapalli	1c7fb4f019	MAPREDUCE-2793. Reneabling commented out test from previous commit. ... svn merge --ignore-ancestry -c 1293521 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293522 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 02:31:59 +00:00
Vinod Kumar Vavilapalli	2b28bb962a	MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha. ... svn merge --ignore-ancestry -c 1293517 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 02:07:19 +00:00
Arun Murthy	c79ae7a8db	Moving branch-0.23 to version 0.23.3-SNAPSHOT ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 01:58:06 +00:00
Tsz-wo Sze	0654e46791	Merge r1293034 through r1293500 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293501 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 01:09:01 +00:00
Thomas Graves	785573713c	merege -r 1293455:1293456 from trunk. FIXES: MAPREDUCE-3904 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293459 13f79535-47bb-0310-9956-ffa450edef68	2012-02-24 22:33:31 +00:00
Tsz-wo Sze	9cb779d735	Revert TestAuditLogger changes from MAPREDUCE-3368. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293058 13f79535-47bb-0310-9956-ffa450edef68	2012-02-24 02:09:09 +00:00
Tsz-wo Sze	024c23c95f	Merge r1291972 through r1293033 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293035 13f79535-47bb-0310-9956-ffa450edef68	2012-02-23 23:52:26 +00:00
Thomas Graves	1714f8b6c7	merge -r 1292830:1292831 from trunk to branch-0.23. FIXES: MAPREDUCE-3878 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292834 13f79535-47bb-0310-9956-ffa450edef68	2012-02-23 15:57:47 +00:00
Alejandro Abdelnur	b512e9f282	Merge -r 1292423:1292424 from trunk to branch. FIXES: MAPREDUCE-3884 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292427 13f79535-47bb-0310-9956-ffa450edef68	2012-02-22 18:03:27 +00:00
Tsz-wo Sze	0e57409872	Merge r1245750 through r1291971 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1291974 13f79535-47bb-0310-9956-ffa450edef68	2012-02-21 19:56:04 +00:00
Vinod Kumar Vavilapalli	55a3a13afa	MAPREDUCE-3798. Fixed failing TestJobCleanup.testCusomCleanup() and moved it to the maven build. Contributed by Ravi Prakash. ... svn merge --ignore-ancestry -c 1291606 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1291607 13f79535-47bb-0310-9956-ffa450edef68	2012-02-21 05:31:33 +00:00
Vinod Kumar Vavilapalli	518fed3ac0	MAPREDUCE-3634. Fixed all daemons to crash instead of hanging around when their EventHandlers get exceptions. (vinodkv) ... svn merge --ignore-ancestry -c 1291598 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1291600 13f79535-47bb-0310-9956-ffa450edef68	2012-02-21 05:11:29 +00:00
Tsz-wo Sze	1d00ed1ffc	svn merge -c 1245828 from trunk for MAPREDUCE-3583. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245831 13f79535-47bb-0310-9956-ffa450edef68	2012-02-18 01:15:48 +00:00
Tsz-wo Sze	bd3c2b26ec	Merge r1244222 through r1245749 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1245750 13f79535-47bb-0310-9956-ffa450edef68	2012-02-17 20:43:55 +00:00
Siddharth Seth	e2beaf7976	merge MAPREDUCE-3856 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245277 13f79535-47bb-0310-9956-ffa450edef68	2012-02-17 01:03:00 +00:00
Robert Joseph Evans	84595f7640	svn merge -c 1245099 from trunk to 0.23 FIXES MAPREDUCE-3849 Change TokenCache's reading of the binary token file (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245102 13f79535-47bb-0310-9956-ffa450edef68	2012-02-16 17:57:08 +00:00
Alejandro Abdelnur	9ea26a7b08	Merge -r 1244263:1244264 from trunk to branch. FIXES: MAPREDUCE-3736 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244265 13f79535-47bb-0310-9956-ffa450edef68	2012-02-14 23:10:40 +00:00
Mahadev Konar	c8debd083b	MAPREDUCE-3858. Task attempt failure during commit results in task never completing. (Tom White via mahadev) - Merging r1244254 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244255 13f79535-47bb-0310-9956-ffa450edef68	2012-02-14 22:53:29 +00:00
Tsz-wo Sze	fd0b6a9596	Merge r1242606 through r1244221 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1244226 13f79535-47bb-0310-9956-ffa450edef68	2012-02-14 21:49:02 +00:00
Vinod Kumar Vavilapalli	d606016217	MAPREDUCE-3854. Fixed and reenabled tests related to MR child JVM's environmental variables in TestMiniMRChildTask. (Tom White via vinodkv) ... svn merge --ignore-ancestry -c 1244223 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244224 13f79535-47bb-0310-9956-ffa450edef68	2012-02-14 21:45:09 +00:00
Vinod Kumar Vavilapalli	26d098b855	MAPREDUCE-3802. Added test to validate that AM can crash multiple times and still can recover successfully after MAPREDUCE-3846. (vinodkv) ... svn merge --ignore-ancestry -c 1244178 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244180 13f79535-47bb-0310-9956-ffa450edef68	2012-02-14 19:25:30 +00:00
Vinod Kumar Vavilapalli	6eadd0201d	MAPREDUCE-3846. Addressed MR AM hanging issues during AM restart and then the recovery. (vinodkv) ... svn merge --ignore-ancestry -c 1243752 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243755 13f79535-47bb-0310-9956-ffa450edef68	2012-02-14 00:11:54 +00:00
Tsz-wo Sze	6c0178e7e5	Merge r1241554 through r1242605 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1242642 13f79535-47bb-0310-9956-ffa450edef68	2012-02-10 03:04:05 +00:00
Robert Joseph Evans	e9c32d2ad1	svn merge -c 1241999 fixes MAPREDUCE-3840 JobEndNotifier doesn't use the proxyToUse during connecting ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242002 13f79535-47bb-0310-9956-ffa450edef68	2012-02-08 17:36:57 +00:00
Arun Murthy	78971a4267	Set version to 0.23.2-SNAPSHOT. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68	2012-02-08 08:12:18 +00:00
Vinod Kumar Vavilapalli	595ea04385	MAPREDUCE-3834. Changed MR AM to not add the same rack entry multiple times into the container request table when multiple hosts for a split happen to be on the same rack. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1241734 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241735 13f79535-47bb-0310-9956-ffa450edef68	2012-02-08 01:57:02 +00:00
Siddharth Seth	5b31bee4d8	merge MAPREDUCE-3822 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241723 13f79535-47bb-0310-9956-ffa450edef68	2012-02-08 00:57:36 +00:00
Arun Murthy	1e20db389c	Merge -c 1241711 from trunk to branch-0.23 to fix MAPREDUCE-3827. Changed Counters to use ConcurrentSkipListMap for performance. Contributed by Vinod K V. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241712 13f79535-47bb-0310-9956-ffa450edef68	2012-02-08 00:17:33 +00:00
Siddharth Seth	5443f258fb	merge <JIRA> from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241693 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 23:07:56 +00:00
Vinod Kumar Vavilapalli	9567b8db20	MAPREDUCE-3815. Fixed MR AM to always use hostnames and never IPs when requesting containers so that scheduler can give off data local containers correctly. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1241654 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241655 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 21:59:39 +00:00
Siddharth Seth	d60facd919	merge MAPREDUCE-3436 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241621 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 20:56:15 +00:00
Tsz-wo Sze	88bf529cfd	Merge r1240450 through r1241553 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1241555 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 19:12:19 +00:00
Arun Murthy	cea037f414	Merge -c 1241319 from trunk to branch-0.23 to fix MAPREDUCE-3697. Support binary compatibility for Counters after MAPREDUCE-901. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241321 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 01:42:29 +00:00
Mahadev Konar	8aa0153373	MAPREDUCE-3794. Support mapred.Task.Counter and mapred.JobInProgress.Counter enums for compatibility (Tom White via mahadev) - Merging r1241299 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241300 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 00:55:46 +00:00
Arun Murthy	c1596a6c3b	Merge -c 1241285 from trunk to branch-0.23 to fix PREDUCE-3811. Made jobclient-to-AM retries configurable. Contributed by Siddharth Seth. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241286 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 00:21:19 +00:00
Arun Murthy	c6356556be	Merge -c 1241282 from trunk to branch-0.23 to fix MAPREDUCE-3809. Ensure that there is no needless sleep in Task at the end of the task. Contributed by Siddharth Seth. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241283 13f79535-47bb-0310-9956-ffa450edef68	2012-02-07 00:14:44 +00:00
Vinod Kumar Vavilapalli	15c308d948	MAPREDUCE-3808. Fixed an NPE in FileOutputCommitter for jobs with maps but no reduces. Contributed by Robert Joseph Evans. ... svn merge --ignore-ancestry -c 1241217 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241218 13f79535-47bb-0310-9956-ffa450edef68	2012-02-06 22:17:18 +00:00
Arun Murthy	caea6d2e85	Merge -c 1241205 from trunk to branch-0.23 to fix MAPREDUCE-3810. Performance tweaks - reduced logging in AM and defined hascode/equals for ResourceRequest & Priority. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241208 13f79535-47bb-0310-9956-ffa450edef68	2012-02-06 22:03:30 +00:00
Mahadev Konar	aaa17aa6ab	MAPREDUCE-3775. Change MiniYarnCluster to escape special chars in testname. (Hitesh Shah via mahadev) - Merging r1240603 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240604 13f79535-47bb-0310-9956-ffa450edef68	2012-02-04 20:21:42 +00:00
Mahadev Konar	7fcab49694	MAPREDUCE-3795. "job -status" command line output is malformed. (vinodkv via mahadev) - Merging r1240593 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240594 13f79535-47bb-0310-9956-ffa450edef68	2012-02-04 19:35:35 +00:00
Mahadev Konar	845fb480c6	MAPREDUCE-3723. TestAMWebServicesJobs & TestHSWebServicesJobs incorrectly asserting tests (Bhallamudi Venkata Siva Kamesh via mahadev) - Merging r1240590 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240591 13f79535-47bb-0310-9956-ffa450edef68	2012-02-04 18:57:20 +00:00
Tsz-wo Sze	2f0489edab	Merge r1239398 through r1240449 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1240450 13f79535-47bb-0310-9956-ffa450edef68	2012-02-04 03:40:45 +00:00
Vinod Kumar Vavilapalli	709bf8f903	MAPREDUCE-3417. Fixed job-access-controls to work with MR AM and JobHistoryServer web-apps. Contributed by Jonathan Eagles. ... svn merge --ignore-ancestry -c 1240428 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240429 13f79535-47bb-0310-9956-ffa450edef68	2012-02-04 01:22:23 +00:00
Vinod Kumar Vavilapalli	4affe6d979	MAPREDUCE-3711. Fixed MR AM recovery so that only single selected task output is recovered and thus reduce the unnecessarily bloated recovery time. Contributed by Robert Joseph Evans. ... svn merge --ignore-ancestry -c 1240413 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240414 13f79535-47bb-0310-9956-ffa450edef68	2012-02-04 00:06:24 +00:00
Alejandro Abdelnur	2c20d0a547	Merge -r 1240409:1240410 from trunk to branch. FIXES: MAPREDUCE-3727 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240411 13f79535-47bb-0310-9956-ffa450edef68	2012-02-03 23:53:09 +00:00
Arun Murthy	818dfb0c5b	Merge -c 1239482 from trunk to branch-0.23 to fix MAPREDUCE-3771. Un-deprecated the old mapred apis, port of MAPREDUCE-1735. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239484 13f79535-47bb-0310-9956-ffa450edef68	2012-02-02 08:39:43 +00:00
Siddharth Seth	feacd4ee5d	merge MAPREDUCE-3744 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239434 13f79535-47bb-0310-9956-ffa450edef68	2012-02-02 01:45:00 +00:00
Siddharth Seth	5254328035	merge MAPREDUCE-3640 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239403 13f79535-47bb-0310-9956-ffa450edef68	2012-02-01 23:34:52 +00:00
Tsz-wo Sze	fe9369fb3c	Merge r1237584 through r1239397 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1239398 13f79535-47bb-0310-9956-ffa450edef68	2012-02-01 23:24:15 +00:00
Mahadev Konar	4c38e6aa9b	MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev) - Merging r1239310 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239312 13f79535-47bb-0310-9956-ffa450edef68	2012-02-01 20:45:33 +00:00
Alejandro Abdelnur	239604718b	Merge -r 1239206:1239207 from trunk to branch. FIXES: MAPREDUCE-3499 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239210 13f79535-47bb-0310-9956-ffa450edef68	2012-02-01 17:09:54 +00:00
Thomas White	000141d77c	Merge -r 1238733:1238734 from trunk to branch-0.23. Fixes: MAPREDUCE-3749 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238735 13f79535-47bb-0310-9956-ffa450edef68	2012-01-31 18:32:29 +00:00
Arun Murthy	85520b1bc4	Merge -c 1238721 from trunk to branch-0.23 to fix MAPREDUCE-3756. Made single shuffle limit configurable. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238723 13f79535-47bb-0310-9956-ffa450edef68	2012-01-31 18:09:39 +00:00