364 Commits

Author	SHA1	Message	Date
Robert Joseph Evans	bc5f02bac0	svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68	2012-08-23 18:07:59 +00:00
Alejandro Abdelnur	6e831b0f5e	MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68	2012-08-23 00:24:36 +00:00
Robert Joseph Evans	1ee0c23b39	svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68	2012-08-21 17:47:08 +00:00
Robert Joseph Evans	f3f8edbd10	svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68	2012-08-21 15:21:30 +00:00
Daryn Sharp	a8f10869a8	svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68	2012-08-17 16:26:01 +00:00
Thomas White	832e7c6dc3	Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68	2012-08-16 13:27:24 +00:00
Tsz-wo Sze	1294ad1df7	svn merge -c 1373683 from trunk for HADOOP-8700. Use enum to define the checksum constants in DataChecksum. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373686 13f79535-47bb-0310-9956-ffa450edef68	2012-08-16 01:42:16 +00:00
Alejandro Abdelnur	fc783dcc1e	MAPREDUCE-4511. Add IFile readahead (ahmed via tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68	2012-08-15 23:11:00 +00:00
Alejandro Abdelnur	b344870bdd	HADOOP-8681. add support for HTTPS to the web UIs. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68	2012-08-13 21:56:31 +00:00
Thomas Graves	6f516ea1bf	merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68	2012-08-13 21:50:21 +00:00
Thomas Graves	5a17a40ee6	merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68	2012-07-31 19:21:27 +00:00
Thomas Graves	4850bf623c	merge -r 1366257:1366258 from trunk. FIXES: MAPREDUCE-4423 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366260 13f79535-47bb-0310-9956-ffa450edef68	2012-07-27 01:48:54 +00:00
Alejandro Abdelnur	f00a592fe9	Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68	2012-07-26 13:25:41 +00:00
Thomas Graves	dce4a7c765	merge -r 1365239:1365240 from trunk. FIXES: MAPREDUCE-4467 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365241 13f79535-47bb-0310-9956-ffa450edef68	2012-07-24 19:28:43 +00:00
Thomas Graves	45c42817ca	svn merge --change -1363455 for reverting MAPREDUCE-4423 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363936 13f79535-47bb-0310-9956-ffa450edef68	2012-07-20 20:21:09 +00:00
Thomas Graves	5568bf8260	merge -r 1363453:1363454 from trunk. FIXES: MAPREDUCE-4423 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363455 13f79535-47bb-0310-9956-ffa450edef68	2012-07-19 18:22:03 +00:00
Robert Joseph Evans	f8bd54b16a	svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362613 13f79535-47bb-0310-9956-ffa450edef68	2012-07-17 19:15:30 +00:00
Robert Joseph Evans	3260960be3	svn merge -c 1361389 FIXES: MAPREDUCE-4419. ./mapred queue -info <queuename> -showJobs displays all the jobs irrespective of <queuename> (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361391 13f79535-47bb-0310-9956-ffa450edef68	2012-07-13 20:45:05 +00:00
Harsh J	f457ffb05b	Backport of MAPREDUCE-4432 from trunk. Confusing warning message when GenericOptionsParser is not used. Contributed by Gabriel Reid. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361275 13f79535-47bb-0310-9956-ffa450edef68	2012-07-13 15:23:09 +00:00
Robert Joseph Evans	75af3cba6b	svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68	2012-07-12 15:53:38 +00:00
Harsh J	91472c5539	Backport of HADOOP-3886 from trunk. svn merge -c 1360222 ../../trunk (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360224 13f79535-47bb-0310-9956-ffa450edef68	2012-07-11 15:07:34 +00:00
Alejandro Abdelnur	3097c15d9d	Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68	2012-07-09 19:19:42 +00:00
Harsh J	41553468b1	Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68	2012-07-09 02:02:53 +00:00
Harsh J	b035a14d58	Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68	2012-07-08 17:24:38 +00:00
Thomas Graves	ca78b62579	merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68	2012-07-05 21:37:53 +00:00
Robert Joseph Evans	93f425a659	svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68	2012-07-05 18:10:51 +00:00
Alejandro Abdelnur	c25a45dc52	Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68	2012-07-05 16:33:34 +00:00
Harsh J	f62de1d81e	svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68	2012-06-30 17:11:46 +00:00
Alejandro Abdelnur	0b4c8a5875	Reverting MAPREDUCE-4346 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68	2012-06-27 18:33:38 +00:00
Alejandro Abdelnur	df2f723a75	Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68	2012-06-25 22:01:01 +00:00
Alejandro Abdelnur	d21c6aa52f	Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68	2012-06-25 21:37:14 +00:00
Robert Joseph Evans	f63255faec	svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68	2012-06-20 21:32:21 +00:00
Siddharth Seth	2846979f16	Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68	2012-06-11 23:16:08 +00:00
Thomas Graves	4159a21d28	merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68	2012-06-11 13:57:15 +00:00
Thomas Graves	c59349ede3	merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68	2012-06-04 15:15:13 +00:00
Harsh J	4200fa906e	svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68	2012-05-29 16:15:25 +00:00
Thomas White	5e473c9c6e	Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68	2012-05-29 14:45:25 +00:00
Harsh J	1f804b5d20	svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68	2012-05-28 14:58:13 +00:00
Robert Joseph Evans	1586e827ed	i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68	2012-05-21 19:07:13 +00:00
Alejandro Abdelnur	00875b37f6	HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 19:46:30 +00:00
Thomas White	dc576b9fa1	Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68	2012-05-11 15:04:24 +00:00
Robert Joseph Evans	c35e442b1b	svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 15:26:11 +00:00
Robert Joseph Evans	4bc2774d79	svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 15:10:03 +00:00
Thomas White	f1e31ebaf2	Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68	2012-05-07 19:07:29 +00:00
Thomas White	e5e15fab74	Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68	2012-04-26 18:48:13 +00:00
Thomas Graves	f8f390b83d	merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68	2012-04-24 13:07:22 +00:00
Robert Joseph Evans	1ea39ddc3c	svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 15:28:19 +00:00
Robert Joseph Evans	0c244e8703	svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:36:47 +00:00
Robert Joseph Evans	8f4c3499f5	svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:24:45 +00:00
Robert Joseph Evans	eec2fd9f74	MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 19:33:04 +00:00
Thomas Graves	7221ae82e5	merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 14:54:03 +00:00
Robert Joseph Evans	461b330ebf	svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68	2012-04-18 18:48:20 +00:00
Robert Joseph Evans	45b2835e9f	svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68	2012-04-17 22:13:52 +00:00
Robert Joseph Evans	8ca897dea2	svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68	2012-04-13 13:46:45 +00:00
Robert Joseph Evans	f9e39d057e	svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68	2012-04-09 21:54:22 +00:00
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	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
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
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
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
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
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
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
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	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	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	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	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	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
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
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
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	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
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
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
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
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
Arun Murthy	599264116d	Merge -c 1236594 from trunk to branch-0.23 to fix MAPREDUCE-3693. Added mapreduce.admin.user.env to mapred-default.xml. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236596 13f79535-47bb-0310-9956-ffa450edef68	2012-01-27 08:50:24 +00:00
Arun Murthy	f1b833c8a3	Merge -c 1236588 from trunk to branch-0.23 to fix MAPREDUCE-3720. Changed bin/mapred job -list to not print job-specific information not available at RM. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236589 13f79535-47bb-0310-9956-ffa450edef68	2012-01-27 08:45:24 +00:00
Vinod Kumar Vavilapalli	981ba68664	MAPREDUCE-3699. Increased RPC handlers for all YARN servers to reasonable values for working at scale. Contributed by Hitesh Shah. ... svn merge --ignore-ancestry -c 1236396 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236398 13f79535-47bb-0310-9956-ffa450edef68	2012-01-26 21:38:31 +00:00
Siddharth Seth	82c1a407d5	merge MAPREDUCE-3718 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236360 13f79535-47bb-0310-9956-ffa450edef68	2012-01-26 19:31:49 +00:00
Arun Murthy	10a3c56fcf	Merge -c 1236041 from trunk to branch-0.23 to fix MAPREDUCE-3721. Fixed a race in shuffle which caused reduces to hang. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236042 13f79535-47bb-0310-9956-ffa450edef68	2012-01-26 05:41:17 +00:00
Vinod Kumar Vavilapalli	c516cc863a	MAPREDUCE-3714. Fixed EventFetcher and Fetcher threads to shut-down properly so that reducers don't hang in corner cases. (vinodkv) ... svn merge --ignore-ancestry -c 1235545 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235546 13f79535-47bb-0310-9956-ffa450edef68	2012-01-24 23:18:46 +00:00
Vinod Kumar Vavilapalli	0bf9779489	MAPREDUCE-3710. Improved FileInputFormat to return better locality for the last split. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1235510 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235511 13f79535-47bb-0310-9956-ffa450edef68	2012-01-24 21:30:48 +00:00
Mahadev Konar	cfff5ff7f4	MAPREDUCE-3646. Remove redundant URL info from "mapred job" output. (Jonathan Eagles via mahadev) - Merging r1235034 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235042 13f79535-47bb-0310-9956-ffa450edef68	2012-01-23 22:34:44 +00:00
Arun Murthy	d36e002fea	Merge -c 1232314 from trunk to branch-0.23 to fix MAPREDUCE-2450. MAPREDUCE-2450. Fixed a corner case with interrupted communication threads leading to a long timeout in Task. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232315 13f79535-47bb-0310-9956-ffa450edef68	2012-01-17 06:12:14 +00:00
Vinod Kumar Vavilapalli	28c7235172	MAPREDUCE-3512. Batching JobHistory flushing to DFS so that we don't flush for every event slowing down AM. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1230353 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230354 13f79535-47bb-0310-9956-ffa450edef68	2012-01-12 01:43:33 +00:00
Mahadev Konar	4c4a0f4f6c	MAPREDUCE-3651. TestQueueManagerRefresh fails. (Thomas Graves via mahadev) - Merging r1230292 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230295 13f79535-47bb-0310-9956-ffa450edef68	2012-01-11 22:35:17 +00:00
Mahadev Konar	5b330e9119	MAPREDUCE-3380. Token infrastructure for running clients which are not kerberos authenticated. (mahadev) - Merging r1229855 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229856 13f79535-47bb-0310-9956-ffa450edef68	2012-01-11 01:56:34 +00:00
Vinod Kumar Vavilapalli	92975b63e5	MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR AM. Improved the earlier patch to not to JobHistoryServer repeatedly. Contributed by Anupam Seth. ... svn merge --ignore-ancestry -c 1229787 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229789 13f79535-47bb-0310-9956-ffa450edef68	2012-01-10 23:09:30 +00:00
Vinod Kumar Vavilapalli	6821efa3ae	MAPREDUCE-3382. Enhanced MR AM to use a proxy to ping the job-end notification URL. Contributed by Ravi Prakash. ... svn merge --ignore-ancestry -c 1229736 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229737 13f79535-47bb-0310-9956-ffa450edef68	2012-01-10 21:09:41 +00:00
Vinod Kumar Vavilapalli	048ac6a4a3	MAPREDUCE-3639. Fixed TokenCache to work with absent FileSystem canonical service-names. (Siddharth Seth via vinodkv) ... svn merge --ignore-ancestry -c 1229444 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229446 13f79535-47bb-0310-9956-ffa450edef68	2012-01-10 01:39:47 +00:00
Vinod Kumar Vavilapalli	70fb248629	MAPREDUCE-3528. Fixed TaskHeartBeatHandler to use a new configuration for the thread loop interval separate from task-timeout configuration property. Contributed by Siddharth Seth. ... svn merge --ignore-ancestry -c 1229403 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229405 13f79535-47bb-0310-9956-ffa450edef68	2012-01-09 22:38:10 +00:00
Vinod Kumar Vavilapalli	65e6abb477	MAPREDUCE-3511. Removed a multitude of cloned/duplicate counters in the AM thereby reducing the AM heap size and preventing full GCs. (vinodkv) ... svn merge -c 1229347 trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229350 13f79535-47bb-0310-9956-ffa450edef68	2012-01-09 21:07:25 +00:00
Alejandro Abdelnur	e3e457398e	Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68	2012-01-05 20:06:52 +00:00
Alejandro Abdelnur	a7f8694d59	Merge -r 1227237:1227238 from trunk to branch. FIXES: MAPREDUCE-1744 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227789 13f79535-47bb-0310-9956-ffa450edef68	2012-01-05 19:50:43 +00:00
Siddharth Seth	b988ba01cd	merge MAPREDUCE-3615 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227742 13f79535-47bb-0310-9956-ffa450edef68	2012-01-05 18:48:46 +00:00
Siddharth Seth	d296bc2a88	merge MAPREDUCE-3595 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227381 13f79535-47bb-0310-9956-ffa450edef68	2012-01-04 23:16:34 +00:00
Siddharth Seth	eb82638bd7	merge MAPREDUCE-3529 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227375 13f79535-47bb-0310-9956-ffa450edef68	2012-01-04 23:08:38 +00:00
Siddharth Seth	769178f3c0	MAPREDUCE-3349. Log rack-name in JobHistory for unsuccessful tasks. (Contributed by Amar Kamat and Devaraj K) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221939 13f79535-47bb-0310-9956-ffa450edef68	2011-12-21 23:36:14 +00:00
Vinod Kumar Vavilapalli	cc6328635b	MAPREDUCE-3339. Fixed MR AM to stop considering node blacklisting after the number of nodes blacklisted crosses a threshold. Contributed by Siddharth Seth. ... svn merge -c 1221523 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221524 13f79535-47bb-0310-9956-ffa450edef68	2011-12-20 23:27:57 +00:00
Arun Murthy	f57c920202	Merge -c 1221501 from trunk to branch-0.23 to fix MAPREDUCE-3376. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221502 13f79535-47bb-0310-9956-ffa450edef68	2011-12-20 22:02:04 +00:00
Arun Murthy	907e861241	Merge -c 1220996 from trunk to branch-0.23 to fix MAPREDUCE-3563. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220997 13f79535-47bb-0310-9956-ffa450edef68	2011-12-19 23:08:19 +00:00
Thomas White	8a58fd5440	Merge -r 1213970:1213971 from trunk to branch-0.23. Fixes: MAPREDUCE-3542. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215360 13f79535-47bb-0310-9956-ffa450edef68	2011-12-17 00:16:04 +00:00
Siddharth Seth	5f43332648	merge MAPREDUCE-3422 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215032 13f79535-47bb-0310-9956-ffa450edef68	2011-12-16 03:11:50 +00:00
Mahadev Konar	1430c33b6d	MAPREDUCE-3541. Fix broken TestJobQueueClient test. (Ravi Prakash via mahadev) - Merging r1214421 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214434 13f79535-47bb-0310-9956-ffa450edef68	2011-12-14 20:00:27 +00:00
Vinod Kumar Vavilapalli	88fe1ae2ed	MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah. ... svn merge -c 1213987 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213989 13f79535-47bb-0310-9956-ffa450edef68	2011-12-13 23:42:50 +00:00
Vinod Kumar Vavilapalli	affa6d2ee1	MAPREDUCE-2863. Support web services for YARN and MR components. Contributed by Thomas Graves. ... svn merge -c 1213975 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213978 13f79535-47bb-0310-9956-ffa450edef68	2011-12-13 23:12:33 +00:00
Mahadev Konar	04cb16ced7	MAPREDUCE-3328. mapred queue -list output inconsistent and missing child queues. (Ravi Prakash via mahadev) - Merging r1213504 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213505 13f79535-47bb-0310-9956-ffa450edef68	2011-12-12 23:58:22 +00:00
Mahadev Konar	62edad08e8	MAPREDUCE-3518. mapred queue -info <queue> -showJobs throws NPE. (Jonathan Eagles via mahadev) - Merging r1213464 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213493 13f79535-47bb-0310-9956-ffa450edef68	2011-12-12 23:11:38 +00:00
Thomas White	81ac5efcaf	Merge -r 1213349:1213350 from trunk to branch-0.23. Fixes: MAPREDUCE-3527 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213355 13f79535-47bb-0310-9956-ffa450edef68	2011-12-12 18:36:28 +00:00
Arun Murthy	194f52bbad	Merge -c 1210738 from trunk to branch-0.23 to fix MAPREDUCE-3496. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210739 13f79535-47bb-0310-9956-ffa450edef68	2011-12-06 01:37:25 +00:00
Alejandro Abdelnur	89d89cb731	Merge -r 1209812:1209813 from trunk to branch. FIXES: HADOOP-3500 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209815 13f79535-47bb-0310-9956-ffa450edef68	2011-12-03 01:09:13 +00:00
Thomas White	c4e06b5aac	Merge -r 1209790:1209791 from trunk to branch-0.23. Fixes: MAPREDUCE-3479. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209792 13f79535-47bb-0310-9956-ffa450edef68	2011-12-03 00:18:17 +00:00
Siddharth Seth	463e78db70	merge MAPREDUCE-3443 from trunk. Contributed by Mahadev Konar ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209232 13f79535-47bb-0310-9956-ffa450edef68	2011-12-01 20:43:34 +00:00
Mahadev Konar	2ba32989db	MAPREDUCE-3450. NM port info no longer available in JobHistory. (Siddharth Seth via mahadev) - Merging r1208327 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208328 13f79535-47bb-0310-9956-ffa450edef68	2011-11-30 08:44:52 +00:00
Thomas White	c4b13d74e5	Merge -r 1207754:1207755 from trunk to branch-0.23. Fixes: MAPREDUCE-3433 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207756 13f79535-47bb-0310-9956-ffa450edef68	2011-11-29 05:12:07 +00:00
Arun Murthy	7467e23b41	Merge -c 1205628 from trunk to branch-0.23 to fix MAPREDUCE-3265. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205629 13f79535-47bb-0310-9956-ffa450edef68	2011-11-23 22:06:47 +00:00
Arun Murthy	fbfe1b0afa	Changing branch-0.23 to 0.23.1-SNAPSHOT. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68	2011-11-22 23:47:40 +00:00
Vinod Kumar Vavilapalli	838bb254fe	MAPREDUCE-3370. Fixed MiniMRYarnCluster and related tests to not use a hard-coded path for the mr-app jar. Contributed by Ahmed Radwan. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200776 13f79535-47bb-0310-9956-ffa450edef68	2011-11-11 08:53:47 +00:00
Vinod Kumar Vavilapalli	5ac8276168	MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null when there isn't a supported token. Contributed by John George. ... svn merge -c r1200484 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200485 13f79535-47bb-0310-9956-ffa450edef68	2011-11-10 19:21:29 +00:00
Vinod Kumar Vavilapalli	b7ff3d01b5	MAPREDUCE-3280. Removed the unnecessary job user-name configuration in mapred-site.xml. (vinodkv) ... svn merge -c r1200441 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200444 13f79535-47bb-0310-9956-ffa450edef68	2011-11-10 17:31:14 +00:00
Thomas White	4f5fdb21cc	Merge -r 1198909:1198910 from trunk to branch-0.23. Fixes: MAPREDUCE-3344. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198914 13f79535-47bb-0310-9956-ffa450edef68	2011-11-07 20:16:12 +00:00
Vinod Kumar Vavilapalli	b793e277aa	MAPREDUCE-3297. Moved log related components into yarn-common so that HistoryServer and clients can use them without depending on the yarn-server-nodemanager module. Contributed by Siddharth Seth. ... svn merge -c r1196986 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196988 13f79535-47bb-0310-9956-ffa450edef68	2011-11-03 08:07:16 +00:00
Arun Murthy	46d9ffc886	Merge -c 1196977 from trunk to branch-0.23 to fix MAPREDUCE-3337. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196978 13f79535-47bb-0310-9956-ffa450edef68	2011-11-03 07:08:33 +00:00
Arun Murthy	e6f85573e7	Merge -c 1195792 from trunk to branch-0.23 to fix MAPREDUCE-3237. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195793 13f79535-47bb-0310-9956-ffa450edef68	2011-11-01 03:19:48 +00:00
Arun Murthy	85ab392795	Merge -c 1195743 from trunk to branch-0.23 to fix MAPREDUCE-3321. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195744 13f79535-47bb-0310-9956-ffa450edef68	2011-11-01 00:59:13 +00:00
Arun Murthy	07c755a394	Merge -c 1195575 from trunk to branch-0.23 to fix MAPREDUCE-3035. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195576 13f79535-47bb-0310-9956-ffa450edef68	2011-10-31 17:29:35 +00:00
Vinod Kumar Vavilapalli	4b4b1c89cc	MAPREDUCE-3146. Added a MR specific command line to dump logs for a given TaskAttemptID. Contributed by Siddharth Seth. ... svn merge -c r1195349 --ignore-ancestry ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195353 13f79535-47bb-0310-9956-ffa450edef68	2011-10-31 06:48:08 +00:00
Thomas White	1d54c6e5a7	Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190706 13f79535-47bb-0310-9956-ffa450edef68	2011-10-29 00:17:58 +00:00
Alejandro Abdelnur	7362f67bcb	Merge -r 1190139:1190140 from trunk to branch. FIXES: MAPREDUCE-3209 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190676 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 23:41:29 +00:00
Alejandro Abdelnur	954b0ff8ab	Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190671 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 23:30:05 +00:00
Alejandro Abdelnur	073139bb57	Merge -r 1185966:1185967 from trunk to branch. FIXES: MAPREDUCE-3199 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190667 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 23:14:55 +00:00
Alejandro Abdelnur	0eba9bcc06	Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 22:36:55 +00:00
Vinod Kumar Vavilapalli	fc8079e054	MAPREDUCE-2989. Modified JobHistory to link to task and AM logs from the JobHistoryServer. Contributed by Siddharth Seth. ... svn merge -c r1190174 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190175 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 06:52:40 +00:00
Mahadev Konar	06e892c3e1	MAPREDUCE-3292. In secure mode job submission fails with Provider org.apache.hadoop.mapreduce.security.token.JobTokenIndentifier not found. (mahadev) - Merging r1190171 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190172 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 06:15:18 +00:00
Mahadev Konar	e8b692c4f6	MAPREDUCE-3186. User jobs are getting hanged if the Resource manager process goes down and comes up while job is getting executed. (Eric Payne via mahadev) - Merging r1190122 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190123 13f79535-47bb-0310-9956-ffa450edef68	2011-10-28 01:42:21 +00:00
Arun Murthy	0991b7560e	Merge -c 1190084 from trunk to branch-0.23 to fix MAPREDUCE-3284. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190086 13f79535-47bb-0310-9956-ffa450edef68	2011-10-27 23:24:15 +00:00
Mahadev Konar	43ef9dbcb5	MAPREDUCE-3264. mapreduce.job.user.name needs to be set automatically. (acmurthy via mahadev) - Merging r1189616 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189617 13f79535-47bb-0310-9956-ffa450edef68	2011-10-27 06:06:30 +00:00
Arun Murthy	b211fc72cc	Merge -c 1189036 from trunk to branch-0.23 to fix for MAPREDUCE-2858. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189037 13f79535-47bb-0310-9956-ffa450edef68	2011-10-26 06:32:26 +00:00
Arun Murthy	b0384fc087	Merge -c 1189012 from trunk to branch-0.23 to complete fix for MAPREDUCE-2977. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189013 13f79535-47bb-0310-9956-ffa450edef68	2011-10-26 02:58:00 +00:00
Arun Murthy	d22a142f94	Merge -c 1188842 from trunk to branch-0.23 to complete fix for MAPREDUCE-3253. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188843 13f79535-47bb-0310-9956-ffa450edef68	2011-10-25 18:14:45 +00:00
Arun Murthy	1bef05715d	Merge -c 1188528 from trunk to branch-0.23 to complete fix for MAPREDUCE-2821. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188529 13f79535-47bb-0310-9956-ffa450edef68	2011-10-25 06:27:24 +00:00
Mahadev Konar	ddccefbefb	MAPREDUCE-2746. Yarn servers can't communicate with each other with hadoop.security.authorization set to true (acmurthy via mahadev) - Merging r1188522 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188524 13f79535-47bb-0310-9956-ffa450edef68	2011-10-25 06:12:14 +00:00
Todd Lipcon	21ded50c4d	MAPREDUCE-3252. Fix map tasks to not rewrite data an extra time when map output fits in spill buffer. Contributed by Todd Lipcon. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188423 13f79535-47bb-0310-9956-ffa450edef68	2011-10-24 22:32:47 +00:00
Arun Murthy	28d52eabfa	Merge -c 1188377 from trunk to branch-0.23 to complete fix for MAPREDUCE-3028. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188378 13f79535-47bb-0310-9956-ffa450edef68	2011-10-24 21:03:22 +00:00
Vinod Kumar Vavilapalli	6069c2a82d	MAPREDUCE-2708. Designed and implemented MR Application Master recovery to make MR AMs resume their progress after restart. Contributed by Sharad Agarwal. ... svn merge -c r1188043 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188044 13f79535-47bb-0310-9956-ffa450edef68	2011-10-24 08:44:54 +00:00
Mahadev Konar	cbd1258918	MAPREDUCE-3239. Use new createSocketAddr API in MRv2 to give better error messages on misconfig (Todd Lipcon via mahadev) - Merging r1187556 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187558 13f79535-47bb-0310-9956-ffa450edef68	2011-10-21 21:38:45 +00:00
Todd Lipcon	5acc010db8	MAPREDUCE-2629. Workaround a JVM class loading quirk which prevents JIT compilation of inner classes methods in ReduceContextImpl. Contributed by Eric Caspole. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187182 13f79535-47bb-0310-9956-ffa450edef68	2011-10-21 05:20:14 +00:00
Arun Murthy	fe370841e6	Merge -c 1187116 from trunk to branch-0.23 to complete fix for MAPREDUCE-3226. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187119 13f79535-47bb-0310-9956-ffa450edef68	2011-10-20 22:45:08 +00:00
Vinod Kumar Vavilapalli	9a8b923418	MAPREDUCE-3104. Implemented Application-acls. (vinodkv) ... svn merge -c r1186748 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186754 13f79535-47bb-0310-9956-ffa450edef68	2011-10-20 12:01:54 +00:00
Arun Murthy	c56916f582	Merge -c 1186542 from trunk to branch-0.23 to complete fix for MAPREDUCE-3208. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186544 13f79535-47bb-0310-9956-ffa450edef68	2011-10-19 22:38:53 +00:00
Arun Murthy	cad9bc8843	Merge -c 1186458 from trunk to branch-0.23 to complete fix for MAPREDUCE-3181. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186459 13f79535-47bb-0310-9956-ffa450edef68	2011-10-19 20:28:49 +00:00
Vinod Kumar Vavilapalli	3b39b29b9c	MAPREDUCE-3176. Fixed ant mapreduce tests that are timing out because of wrong framework name. Contributed by Hitesh Shah. ... svn merge -c r1186368 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186369 13f79535-47bb-0310-9956-ffa450edef68	2011-10-19 17:58:32 +00:00
Vinod Kumar Vavilapalli	e3b9d11da8	MAPREDUCE-3144. Augmented JobHistory with the information needed for serving aggregated logs. Contributed by Siddharth Seth. ... svn merge -c r1185976 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185977 13f79535-47bb-0310-9956-ffa450edef68	2011-10-19 05:28:22 +00:00
Arun Murthy	dfb1c18558	Merge -c 1185887 from trunk to branch-0.23 to complete fix for MAPREDUCE-3165. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185888 13f79535-47bb-0310-9956-ffa450edef68	2011-10-18 21:46:15 +00:00
Arun Murthy	a990576916	Merge -c 1185880 from trunk to branch-0.23 to complete fix for MAPREDUCE-2762. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185881 13f79535-47bb-0310-9956-ffa450edef68	2011-10-18 21:38:08 +00:00
Jitendra Nath Pandey	e8caaba2f3	Merged r1183513 from trunk for MAPREDUCE-3192. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183579 13f79535-47bb-0310-9956-ffa450edef68	2011-10-15 01:26:33 +00:00
Jitendra Nath Pandey	0672834f2d	Merged r1183187 from trunk for MAPREDUCE-2764. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183576 13f79535-47bb-0310-9956-ffa450edef68	2011-10-15 01:16:34 +00:00
Arun Murthy	8876fb033f	Merge -c 1183188 from trunk to branch-0.23 to fix MAPREDUCE-3124. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183189 13f79535-47bb-0310-9956-ffa450edef68	2011-10-14 01:27:56 +00:00
Arun Murthy	ea8f6cf534	Merge -c 1183185 from trunk to branch-0.23 to fix MAPREDUCE-3170. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183186 13f79535-47bb-0310-9956-ffa450edef68	2011-10-14 01:17:11 +00:00
Arun Murthy	c2ae3d6e36	Merge -c 1182616 from trunk to branch-0.23 to fix MAPREDUCE-2789. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182617 13f79535-47bb-0310-9956-ffa450edef68	2011-10-12 23:29:53 +00:00
Arun Murthy	b57ac1cf61	Merge -c 1182613 from trunk to branch-0.23 to fix MAPREDUCE-2666. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182614 13f79535-47bb-0310-9956-ffa450edef68	2011-10-12 23:12:37 +00:00
Arun Murthy	76fb42f94d	Merge -c 1182008 from trunk to branch-0.23 to fix MAPREDUCE-3126. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182009 13f79535-47bb-0310-9956-ffa450edef68	2011-10-11 18:30:00 +00:00
Vinod Kumar Vavilapalli	ddaf7c8a7f	MAPREDUCE-3161. svn merge -c r1181622 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181623 13f79535-47bb-0310-9956-ffa450edef68	2011-10-11 04:47:28 +00:00
Arun Murthy	8d0daf8843	Merge -c 1181310 from trunk to branch-0.23 to fix MAPREDUCE-3158. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181311 13f79535-47bb-0310-9956-ffa450edef68	2011-10-11 00:27:39 +00:00
Arun Murthy	590ff92e7a	Merge -c 1180774 from trunk to branch-0.23 to fix MAPREDUCE-3154. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180775 13f79535-47bb-0310-9956-ffa450edef68	2011-10-10 03:30:24 +00:00
Arun Murthy	fce52877b1	Merge -c 1180214 from trunk to branch-0.23 to fix MAPREDUCE-3033. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180216 13f79535-47bb-0310-9956-ffa450edef68	2011-10-07 20:40:40 +00:00
Vinod Kumar Vavilapalli	763327fd51	MAPREDUCE-2702. svn merge -c r1179188 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179191 13f79535-47bb-0310-9956-ffa450edef68	2011-10-05 12:17:46 +00:00
Vinod Kumar Vavilapalli	fd1e8b15d5	MAPREDUCE-3056. svn merge -c r1178740 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178741 13f79535-47bb-0310-9956-ffa450edef68	2011-10-04 09:39:50 +00:00
Arun Murthy	4f754bfb15	Merge -r 1178649:1178650 from trunk to branch-0.23 to fix MAPREDUCE-3138. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178651 13f79535-47bb-0310-9956-ffa450edef68	2011-10-04 00:43:20 +00:00
Konstantin Shvachko	1efe4e403d	MAPREDUCE-2779. JobSplitWriter.java can't handle large job.split file. Contributed by Ming Ma. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177783 13f79535-47bb-0310-9956-ffa450edef68	2011-09-30 19:16:54 +00:00
Arun Murthy	be51b71dee	Merge -r 1177530:1177531 from trunk to branch-0.23 to fix MAPREDUCE-2996. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177532 13f79535-47bb-0310-9956-ffa450edef68	2011-09-30 06:49:43 +00:00
Arun Murthy	f99d1f7fde	Merge -r 1177486:1177487 from trunk to branch-0.23 to fix MAPREDUCE-2791. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177490 13f79535-47bb-0310-9956-ffa450edef68	2011-09-30 03:10:57 +00:00
Vinod Kumar Vavilapalli	6b6e177b70	MAPREDUCE-2952. svn merge -c r1175403 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175408 13f79535-47bb-0310-9956-ffa450edef68	2011-09-25 14:54:00 +00:00
Arun Murthy	da47ed5089	Merge -r 1175293:1175294 from trunk to branch-0.23 to fix MAPREDUCE-2961. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175295 13f79535-47bb-0310-9956-ffa450edef68	2011-09-25 04:51:23 +00:00
Arun Murthy	2be11b42a1	Merge -r 1174293:1174294 from trunk to branch-0.23 to fix MAPREDUCE-3073. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174295 13f79535-47bb-0310-9956-ffa450edef68	2011-09-22 18:06:20 +00:00
Vinod Kumar Vavilapalli	c679348aa5	MAPREDUCE-2754. svn merge -c r1174194 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174195 13f79535-47bb-0310-9956-ffa450edef68	2011-09-22 15:18:50 +00:00
Mahadev Konar	9b93426833	MAPREDUCE-3044. Pipes jobs stuck without making progress. (mahadev) - Merging -r1173909 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173910 13f79535-47bb-0310-9956-ffa450edef68	2011-09-21 23:54:44 +00:00
Vinod Kumar Vavilapalli	01da4430d2	MAPREDUCE-2880. svn merge -c r1173783 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173792 13f79535-47bb-0310-9956-ffa450edef68	2011-09-21 18:52:27 +00:00
Vinod Kumar Vavilapalli	83d9dc9f8c	MAPREDUCE-2970. svn merge -c r1173534 --ignore-ancestry ../../trunk/ ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173536 13f79535-47bb-0310-9956-ffa450edef68	2011-09-21 09:15:39 +00:00
Arun Murthy	6c784e74fd	Merge -r 1172892:1172893 from trunk to branch-0.23 to fix MAPREDUCE-3004. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172895 13f79535-47bb-0310-9956-ffa450edef68	2011-09-19 23:18:10 +00:00
Mahadev Konar	8c99dc8435	MAPREDUCE-1788. o.a.h.mapreduce.Job shouldn't make a copy of the JobConf. (Arun Murthy via mahadev) - Merging r1172171 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172172 13f79535-47bb-0310-9956-ffa450edef68	2011-09-18 02:52:44 +00:00
Arun Murthy	c09246b2e8	Fixed broken merge for MAPREDUCE-2987 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171924 13f79535-47bb-0310-9956-ffa450edef68	2011-09-17 07:16:47 +00:00