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

1966 Commits

Author SHA1 Message Date
Vinayakumar B cda1962996 MAPREDUCE-6360. TestMapreduceConfigFields is placed in wrong dir, introducing compile error (Contributed by Arshad Mohammad) 
(cherry picked from commit 360dff5903)
 2015-05-12 12:50:44 +05:30
Jason Lowe 53e9973afc MAPREDUCE-5465. Tasks are often killed before they exit on their own. Contributed by Ming Ma 2015-05-11 22:40:05 +00:00
Junping Du a1a7deebf8 YARN-3587. Fix the javadoc of DelegationTokenSecretManager in yarn, etc. projects. Contributed by Gabor Liptak. 
(cherry picked from commit 7e543c27fa)
 2015-05-11 05:28:25 -07:00
Karthik Kambatla 52469b10dd MAPREDUCE-6353. Divide by zero error in MR AM when calculating available containers. (Anubhav Dhoot via kasha) 
(cherry picked from commit 1773aac780)
 2015-05-09 14:43:57 -07:00
Karthik Kambatla e8dd0bc4fd YARN-1287. Consolidate MockClocks. (Sebastian Wong and Anubhav Dhoot via kasha) 
(cherry picked from commit 70fb37cd79)
 2015-05-09 14:35:13 -07:00
Junping Du 39c188449e MAPREDUCE-6359. In RM HA setup, Cluster tab links populated with AM hostname instead of RM. Contributed by zhaoyunjiong. 
(cherry picked from commit df36ad0a08)
 2015-05-09 06:12:01 -07:00
Ravi Prakash 23065e6051 MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie and Jason Lowe via raviprak) 
(cherry picked from commit 5aab014340)
 2015-05-08 15:58:29 -07:00
Jason Lowe 0f6c971282 MAPREDUCE-5248. Let NNBenchWithoutMR specify the replication factor for its test. Contributed by Erik Paulson 
(cherry picked from commit 30099a36c6)
 2015-05-08 22:30:21 +00:00
Chris Douglas 4f301f92c1 MAPREDUCE-2094. LineRecordReader should not seek into non-splittable, compressed streams. 2015-05-08 14:30:56 -07:00
Jason Lowe dfc4a62f7d MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in ReduceTask. Contributed by Binglin Chang 
(cherry picked from commit c39012f4a0)
 2015-05-08 21:17:05 +00:00
Devaraj K a957baeb71 MAPREDUCE-5981. Log levels of certain MR logs can be changed to DEBUG. 
Contributed by Varun Saxena.

(cherry picked from commit dc2b2ae31f)
 2015-05-08 21:28:52 +05:30
Devaraj K ade5165ecf MAPREDUCE-6342. Make POM project names consistent. Contributed by Rohith. 2015-05-08 15:20:35 +05:30
Akira Ajisaka 5cc036d473 MAPREDUCE-6079. Rename JobImpl#username to reporterUserName. Contributed by Tsuyoshi Ozawa. 
(cherry picked from commit ecfa052274)
 2015-05-08 18:17:35 +09:00
Tsuyoshi Ozawa 1ae8bf5b21 MAPREDUCE-6284. Add Task Attempt State API to MapReduce Application Master REST API. Contributed by Ryu Kobayashi. 
(cherry picked from commit d18f10ad1b)
 2015-05-08 16:00:41 +09:00
Jason Lowe 976a3c1f9d MAPREDUCE-6279. AM should explicity exit JVM after all services have stopped. Contributed by Eric Payne 
(cherry picked from commit f30065c8b6)
 2015-05-07 22:06:54 +00:00
Akira Ajisaka f7c011cbaa MAPREDUCE-6356. Misspelling of threshold in log4j.properties for tests. Contributed by Brahma Reddy Battula. 
(cherry picked from commit d335071398)
 2015-05-07 19:41:44 +09:00
Robert Kanter bd207b6cc0 MAPREDUCE-6192. Create unit test to automatically compare MR related classes and mapred-default.xml (rchiang via rkanter) 2015-05-05 14:47:52 -07:00
Xuan 02cdcaec58 YARN-2123. Progress bars in Web UI always at 100% due to non-US locale. 
Contributed by Akira AJISAKA

(cherry picked from commit b7dd3a4f04)
 2015-05-05 10:45:18 -07:00
Tsuyoshi Ozawa 4e96175b33 MAPREDUCE-6165. [JDK8] TestCombineFileInputFormat failed on JDK8. Contributed by Akira AJISAKA. 
(cherry picked from commit 551615fa13)
 2015-05-05 10:23:25 +09:00
Jason Lowe 81f128f293 MAPREDUCE-6259. IllegalArgumentException due to missing job submit time. Contributed by zhihai xu 
(cherry picked from commit bf70c5ae28)
 2015-05-04 20:40:16 +00:00
Jason Lowe 87c2d915f1 MAPREDUCE-5649. Reduce cannot use more than 2G memory for the final merge. Contributed by Gera Shegalov 
(cherry picked from commit 7dc3c1203d)
 2015-05-04 19:03:43 +00:00
Tsuyoshi Ozawa 7e03bda3e7 MAPREDUCE-6349. Fix typo in property org.apache.hadoop.mapreduce.lib.chain.Chain.REDUCER_INPUT_VALUE_CLASS. Contributed by Ray Chiang. 
(cherry picked from commit bb6ef2984d)
 2015-05-04 15:36:53 +09:00
Tsuyoshi Ozawa 1035f550b9 MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary null strings. Contributed by Akira AJISAKA. 
(cherry picked from commit 3ba18362f2)
 2015-05-04 15:02:40 +09:00
Gera Shegalov ff6492d603 MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster logs. (Rohit Agarwal via gera) 
(cherry picked from commit f1a152cc0a)
 2015-05-01 19:07:14 -07:00
Devaraj K c3d083a9ff MAPREDUCE-6339. Job history file is not flushed correctly because 
isTimerActive flag is not set true when flushTimerTask is scheduled.
Contributed by zhihai xu.

(cherry picked from commit f5b38477f9)
 2015-04-30 12:36:00 +05:30
Jason Lowe ea828578a3 MAPREDUCE-6334. Fetcher#copyMapOutput is leaking usedMemory upon IOException during InMemoryMapOutput shuffle handler. Contributed by Eric Payne 
(cherry picked from commit bc1bd7e5c4)
 2015-04-28 20:19:52 +00:00
Devaraj K 1d03ac3533 Moving MAPREDUCE-6252 to the 2.7.1 CHANGES.txt 
(cherry picked from commit 99fe03e439)
 2015-04-28 12:44:07 +05:30
Vinod Kumar Vavilapalli 32dc13d907 MAPREDUCE-6324. Fixed MapReduce uber jobs to not fail the udpate of AM-RM tokens when they roll-over. Contributed by Jason Lowe. 
(cherry picked from commit 9fc32c5c4d)
 2015-04-27 14:59:57 -07:00
Tsuyoshi Ozawa fa9def5a2a MAPREDUCE-6341. Fix typo in mapreduce tutorial. Contributed by John Michael Luy. 
(cherry picked from commit 9a3dda3d34)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
 2015-04-28 01:58:12 +09:00
Devaraj K 84ae26573c MAPREDUCE-6252. JobHistoryServer should not fail when encountering a 
missing directory. Contributed by Craig Welch.

(cherry picked from commit 5e67c4d384)
 2015-04-27 15:02:44 +05:30
Gera Shegalov fa915f73e2 MAPREDUCE-6333. TestEvents,TestAMWebServicesTasks,TestAppController are broken due to MAPREDUCE-6297. (Siqi Li via gera) 
(cherry picked from commit 78c6b46241)
 2015-04-24 17:38:16 -07:00
Vinod Kumar Vavilapalli db1a33e956 Moving YARN-3351, YARN-3382, YARN-3472, MAPREDUCE-6238 to the 2.7.1 CHANGES.txt 
sections given the recent merge into branch-2.7.

(cherry picked from commit 2f82ae042a)
 2015-04-24 17:20:02 -07:00
Vinod Kumar Vavilapalli 0ec6e7e7f5 YARN-3413. Changed Nodelabel attributes (like exclusivity) to be settable only via addToClusterNodeLabels but not changeable at runtime. (Wangda Tan via vinodkv) 
(cherry picked from commit f5fe35e297)
 2015-04-23 11:25:30 -07:00
Tsuyoshi Ozawa a479669e96 Fix a misleading summary of MAPREDUCE-6330 in CHANGES.txt. 
(cherry picked from commit 252e69f562)
 2015-04-23 03:28:46 +09:00
Tsuyoshi Ozawa 542d53a268 MAPREDUCE-6330. Fix typo in some Task Attempt API's URL. Contributed by Ryu Kobayashi. 
(cherry picked from commit e33594dd87)
 2015-04-23 03:22:02 +09:00
Gera Shegalov 6f06e3b7ea MAPREDUCE-6297. Task Id of the failed task in diagnostics should link to the task page. (Siqi Li via gera) 
(cherry picked from commit 89ded89e86)
 2015-04-21 14:21:57 -07:00
Gera Shegalov 6f5dc9f5af MAPREDUCE-6293. Set job classloader on uber-job's LocalContainerLauncher event thread. (Sangjin Lee via gera) 
(cherry picked from commit 725eb52ddc)
 2015-04-21 14:21:56 -07:00
Vinod Kumar Vavilapalli 27fc4fb998 Set the release date for 2.7.0 
(cherry picked from commit d52de61544)
 2015-04-20 20:18:01 -07:00
Robert Kanter 756c254293 MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options which is a regression from MR1 (zxu via rkanter) 
(cherry picked from commit d50e8f0928)
 2015-04-20 14:14:49 -07:00
Jian He 42cf8e0554 YARN-3021. YARN's delegation-token handling disallows certain trust setups to operate properly over DistCp. Contributed by Yongjun Zhang 
(cherry picked from commit bb6dde68f1)
 2015-04-16 19:44:32 -07:00
Akira Ajisaka 51c458a5c4 MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li. 
(cherry picked from commit 1fa8075794)
 2015-04-16 10:06:03 -05:00
Akira Ajisaka 4801b0b478 Revert "MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li." 
This reverts commit 3de0bf9a35.
 2015-04-11 12:37:44 +09:00
Jian He d3daf9665c YARN-3348. Add a 'yarn top' tool to help understand cluster usage. Contributed by Varun Vasudev 2015-04-10 10:40:31 -07:00
Akira Ajisaka 3de0bf9a35 MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li. 
(cherry picked from commit 4cec9975c0e2c2fcca090888dc2c5e149c5be1e9)
 2015-04-11 01:31:44 +09:00
Akira Ajisaka f603b9ccca MAPREDUCE-6307. Remove property mapreduce.tasktracker.taskmemorymanager.monitoringinterval. Contributed by J.Andreina. 
(cherry picked from commit 83979e61a4)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
 2015-04-10 20:23:46 +09:00
Harsh J b817f0924d MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev. 
(cherry picked from commit c91b2de68a)
 2015-04-10 14:03:37 +05:30
Vinod Kumar Vavilapalli aec1c5ec7d Adding release 2.7.1 to CHANGES.txt 
(cherry picked from commit 623fd46c1e)
 2015-04-09 13:56:14 -07:00
Robert Kanter 0fdd5c23c3 MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL (rchiang via rkanter) 
(cherry picked from commit c4986b2d00)
 2015-04-09 13:49:03 -07:00
Hitesh Shah 55b794e7fa YARN-2890. MiniYarnCluster should turn on timeline service if configured to do so. Contributed by Mit Desai. 
(cherry picked from commit 265ed1fe80)
 2015-04-08 14:14:06 -07:00
Gera Shegalov 3757e731e6 MAPREDUCE-4844. Counters / AbstractCounters have constant references not declared final. (Brahma Reddy Battula via gera) 
(cherry picked from commit a0795c1e81)
 2015-04-03 10:35:18 -07:00
Junping Du cacadea632 MAPREDUCE-6303. Read timeout when retrying a fetch error can be fatal to a reducer. Contributed by Jason Lowe. 
(cherry picked from commit eccb7d46ef)
 2015-04-02 12:15:12 -07:00
Vinod Kumar Vavilapalli 4cf44bef5c Reverted MAPREDUCE-6286, MAPREDUCE-6199, and MAPREDUCE-5875 from branch-2.7. Editing CHANGES.txt to reflect this. 
(cherry picked from commit e428fea730)
 2015-03-31 13:30:22 -07:00
Vinod Kumar Vavilapalli defae1d399 Revert "MAPREDUCE-6288. Changed permissions on JobHistory server's done directory so that user's client can load the conf files directly. Contributed by Robert Kanter." 
This reverts commit 5358b83167.

(cherry picked from commit cc0a01c503)
 2015-03-30 14:52:36 -07:00
Vinod Kumar Vavilapalli cc130a033a MAPREDUCE-6288. Changed permissions on JobHistory server's done directory so that user's client can load the conf files directly. Contributed by Robert Kanter. 
(cherry picked from commit 5358b83167)
 2015-03-30 10:28:28 -07:00
Vinod Kumar Vavilapalli c5bc48946d YARN-3304. Cleaning up ResourceCalculatorProcessTree APIs for public use and removing inconsistencies in the default values. Contributed by Junping Du and Karthik Kambatla. 
(cherry picked from commit c358368f51)
 2015-03-30 10:11:12 -07:00
Harsh J 274db918c3 MAPREDUCE-6291. Correct mapred queue usage command. Contributed by Brahma Reddy Battula. 
(cherry picked from commit f5432cb47dfacaa57faed32a29d00bbeff8a5385)
 2015-03-28 11:58:44 +05:30
Akira Ajisaka 853cc04668 MAPREDUCE-5762. Port MAPREDUCE-3223 (Remove MRv1 config from mapred-default.xml) to branch-2. (aajisaka) 2015-03-28 03:35:03 +09:00
Tsuyoshi Ozawa f0aa2a7466 MAPREDUCE-6294. Remove an extra parameter described in Javadoc of TockenCache. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 05499b1093)
 2015-03-28 00:08:56 +09:00
Akira Ajisaka 2e509908ee MAPREDUCE-6292. Use org.junit package instead of junit.framework in TestCombineFileInputFormat. (aajisaka) 
(cherry picked from commit c770df49b4)
 2015-03-25 19:01:38 +09:00
Harsh J d85c14afbf MAPREDUCE-579. Streaming slowmatch documentation. 
(cherry picked from commit a2e42d2deee715f6255d6fd2c95f34e80888dc5f)
 2015-03-25 14:39:46 +05:30
Tsuyoshi Ozawa 94eb8e5b3d MAPREDUCE-6285. ClientServiceDelegate should not retry upon AuthenticationException. Contributed by Jonathan Eagles. 
(cherry picked from commit 4170c99147)
 2015-03-25 00:57:08 +09:00
Devaraj K 943d9ee603 MAPREDUCE-6242. Progress report log is incredibly excessive in application 
master. Contributed by Varun Saxena.
 2015-03-23 22:48:00 +05:30
Harsh J 2cd2431289 MAPREDUCE-6287. Deprecated methods in org.apache.hadoop.examples.Sort. Contributed by Chao Zhang. 
(cherry picked from commit b375d1fc93)
 2015-03-23 03:48:55 +05:30
Harsh J 6e6e0e4a37 MAPREDUCE-5448. Addendum fix to remove deprecation warning by junit.Assert import in TestFileOutputCommitter. 
(cherry picked from commit 4cd54d9a29)
 2015-03-22 10:33:29 +05:30
Harsh J 40682a4aad MAPREDUCE-6286. Amend commit to CHANGES.txt for backport into 2.7.0. 
(cherry picked from commit 8770c82acc)
 2015-03-22 10:16:12 +05:30
Harsh J d43c0da7d7 MAPREDUCE-5190. Unnecessary condition test in RandomSampler. Contributed by Jingguo Yao. 
(cherry picked from commit 1d5c796d65)
 2015-03-22 10:04:19 +05:30
Harsh J a7f1c1b993 MAPREDUCE-5448. MapFileOutputFormat#getReaders bug with invisible files/folders. Contributed by Maysam Yabandeh. 
(cherry picked from commit b46c2bb51a)
 2015-03-22 09:46:54 +05:30
Harsh J 7c72c7f529 MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which causes counter limits are not reset correctly. Contributed by Zhihai Xu. 
(cherry picked from commit 433542904a)
 2015-03-22 02:51:17 +05:30
Harsh J 418d078bc5 MAPREDUCE-6213. NullPointerException caused by job history server addr not resolvable. Contributed by Peng Zhang. 
(cherry picked from commit e1e09052e8)
 2015-03-22 02:45:01 +05:30
Harsh J 97da36777f MAPREDUCE-6239. Consolidate TestJobConf classes in hadoop-mapreduce-client-jobclient and hadoop-mapreduce-client-core. Contributed by Varun Saxena. 2015-03-22 02:20:11 +05:30
Robert Kanter 308460654a MAPREDUCE-6282. Reuse historyFileAbsolute.getFileSystem in CompletedJob#loadFullHistoryData for code optimization. (zxu via rkanter) 
(cherry picked from commit d4f7e2507f)
 2015-03-20 13:12:34 -07:00
Jason Lowe cabe676d67 MAPREDUCE-6275. Race condition in FileOutputCommitter v2 for user-specified task output subdirs. Contributed by Gera Shegalov and Siqi Li 
(cherry picked from commit 91baca145a)
 2015-03-19 21:40:51 +00:00
Tsuyoshi Ozawa ef9aa7c34b MAPREDUCE-6281. Fix javadoc in Terasort. Contributed by Albert Chu. 
(cherry picked from commit 1ccbc29708)
 2015-03-20 00:59:43 +09:00
Jason Lowe 24d8c6f355 MAPREDUCE-6277. Job can post multiple history files if attempt loses connection to the RM. Contributed by Chang Li 
(cherry picked from commit 30da99cbaf)
 2015-03-18 19:31:32 +00:00
Harsh J 4e80c4cd5e MAPREDUCE-5807. Print usage for TeraSort job. Contributed by Rohith. 
(cherry picked from commit 9d72f93975)
 2015-03-18 17:31:25 +05:30
Harsh J c58786794b MAPREDUCE-4653. TestRandomAlgorithm has an unused import statement. Contributed by Amir Sanjar. 
(cherry picked from commit 75e4670408a058efa95eaa768fedbe614008658f)
 2015-03-17 14:13:23 +05:30
Tsuyoshi Ozawa bb828565f8 MAPREDUCE-5755. MapTask.MapOutputBuffer#compare/swap should have @Override annotation. (ozawa) 
(cherry picked from commit bb243cea93)
 2015-03-17 14:55:33 +09:00
Harsh J 5e403e8b8d MAPREDUCE-6100. replace mapreduce.job.credentials.binary with MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability. Contributed by Zhihai Xu. 
(cherry picked from commit f222bde273)
 2015-03-17 11:08:32 +05:30
Harsh J 0e9f78dda2 MAPREDUCE-6105. nconsistent configuration in property mapreduce.reduce.shuffle.merge.percent. Contributed by Ray Chiang. 
(cherry picked from commit 26a23b11598b3757ed4973781890e2cd2fc270df)
 2015-03-17 02:27:33 +05:30
Harsh J 2684b0b440 MAPREDUCE-4414. Add main methods to JobConf and YarnConfiguration, for debug purposes. Contributed by Plamen Jeliazkov. 
(cherry picked from commit 571f75b468a4412be2178466cb5d3888b05cd076)
 2015-03-17 01:02:21 +05:30
Tsuyoshi Ozawa c5c544c1b7 Moving CHANGES.txt entry for MAPREDUCE-4742 to branch-2.7. 
(cherry picked from commit bd0a9ba8e3)
 2015-03-14 16:54:50 +09:00
Tsuyoshi Ozawa 10745fcecd MAPREDUCE-6265. Make ContainerLauncherImpl.INITIAL_POOL_SIZE configurable to better control to launch/kill containers. Contributed by Zhihai Xu 
(cherry picked from commit 9d38520c8e)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 2015-03-14 16:45:23 +09:00
Jonathan Eagles 44aedad5dd YARN-3267. Timelineserver applies the ACL rules after applying the limit on the number of records (Chang Li via jeagles) 
(cherry picked from commit 8180e676ab)
 2015-03-13 12:05:21 -05:00
Haohui Mai e75e6c66ea HADOOP-11633. Convert remaining branch-2 .apt.vm files to markdown. Contributed by Masatake Iwasaki. 2015-03-11 14:23:44 -07:00
Gera Shegalov 6802e8fefc MAPREDUCE-4815. Speed up FileOutputCommitter#commitJob for many output files. (Siqi Li via gera) 
(cherry picked from commit aa92b764a7)
 2015-03-10 11:40:45 -07:00
Tsuyoshi Ozawa 482504befd MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie. 
(cherry picked from commit 20b8ee1350)
 2015-03-11 00:41:37 +09:00
Junping Du dbcdcb0d3c Configurable timeout between YARNRunner terminate the application and forcefully kill. Contributed by Eric Payne. 
(cherry picked from commit d39bc903a0)
 2015-03-10 06:23:24 -07:00
Tsuyoshi Ozawa b46f9e72db HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa) 2015-03-09 19:53:55 +09:00
Vinod Kumar Vavilapalli d9416317a9 Preparing for 2.8.0 development. Changing SNAPSHOT version to be 2.8 on branch-2. 2015-03-08 20:32:51 -07:00
Vinod Kumar Vavilapalli 8e6f8e9a04 Adding 2.8 section in CHANGES.txt 2015-03-08 20:26:57 -07:00
Tsuyoshi Ozawa 3c24e50ce2 Update CHANGES.txt for MAPREDUCE-5657. 2015-03-09 12:07:56 +09:00
Tsuyoshi Ozawa ccde4aed18 MAPREDUCE-5657. Backport '[JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments.' Contributed by Akira AJISAKA. 2015-03-09 12:00:04 +09:00
Tsuyoshi Ozawa ac874764d5 MAPREDUCE-6136. MRAppMaster doesn't shutdown file systems. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 348208014b)
 2015-03-05 14:13:13 +09:00
Karthik Kambatla f4d6c5e337 MAPREDUCE-6267. Refactor JobSubmitter#copyAndConfigureFiles into it's own class. (Chris Trezzo via kasha) 
(cherry picked from commit c66c3ac6bf)
 2015-03-04 14:47:06 -08:00
Vinod Kumar Vavilapalli 6604613bc5 MAPREDUCE-6248. Exposed the internal MapReduce job's information as a public API in DistCp. Contributed by Jing Zhao. 
(cherry picked from commit 5af693fde2)
 2015-03-03 16:29:36 -08:00
Junping Du a9613bcc94 Ability to limit running map and reduce tasks. Contributed by Jason Lowe. 
(cherry picked from commit 4228de9402)

Conflicts:
    hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 2015-03-03 02:23:00 -08:00
Tsuyoshi Ozawa b1e7f9c588 MAPREDUCE-6268. Fix typo in Task Attempt API's URL. Contributed by Ryu Kobayashi. 
(cherry picked from commit 742f9d90c0)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/markdown/HistoryServerRest.md
 2015-03-03 16:24:27 +09:00
Akira Ajisaka f7a724ca9e HADOOP-10976. Backport "moving the source code of hadoop-tools docs to the directory under hadoop-tools" to branch-2. Contributed by Masatake Iwasaki. 
(cherry picked from commit 9112f093cd)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-02-28 17:06:58 -08:00
Konstantin V Shvachko 9e67f2cb0d YARN-3255. RM, NM, JobHistoryServer, and WebAppProxyServer's main() should support generic options. Contributed by Konstantin Shvachko. 2015-02-26 17:26:08 -08:00
Akira Ajisaka 8aa0c73294 MAPREDUCE-5612. Add javadoc for TaskCompletionEvent.Status. Contributed by Chris Palmer. 
(cherry picked from commit bfbf076b7d)
 2015-02-26 15:06:26 -08:00