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

1667 Commits

Author SHA1 Message Date
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
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
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
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
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
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 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
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
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 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
Akira Ajisaka 5f0d1f10db MAPREDUCE-2815. JavaDoc does not generate correctly for MultithreadedMapRunner. Contributed by Chris Palmer. 
(cherry picked from commit 9a37247a67)
 2015-02-24 12:11:22 -08:00
Akira Ajisaka 5e686dae44 MAPREDUCE-6264. Remove httpclient dependency from hadoop-mapreduce-client. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 3f665aa4d5ac2e737e29ff63b3837c083a49ea80)
 2015-02-24 11:33:05 -08:00
Plamen Jeliazkov 32d215dc89 MAPREDUCE-6228. Add truncate operation to SLive. Contributed by Plamen Jeliazkov. 2015-02-19 00:14:11 -08:00
Jason Lowe 386e62ace3 MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked twice. Contributed by Tsuyoshi OZAWA 
(cherry picked from commit 4981d082d4)
 2015-02-18 19:28:45 +00:00
Tsuyoshi Ozawa 9523b52da5 MAPREDUCE-4286. TestClientProtocolProviderImpls passes on failure conditions. Contributed by Devaraj K. 
(cherry picked from commit 7c782047c6)
 2015-02-18 15:46:06 +09:00
Junping Du 1d91daaae9 MAPREDUCE-6225. Fix new findbug warnings in hadoop-mapreduce-client-core. Contributed by Varun Saxena 
(cherry picked from commit 814afa46ef)
 2015-02-16 09:39:20 -08:00
Tsuyoshi Ozawa 7011125778 MAPREDUCE-6256. Removed unused private methods in o.a.h.mapreduce.Job.java. Contributed by Naganarasimha G R. 
(cherry picked from commit 3338f6d907)
 2015-02-15 10:10:11 +09:00
Tsuyoshi Ozawa 7386323735 MAPREDUCE-6255. Fix JobCounter's format to use grouping separator. Contributed by Ryu Kobayashi. 
(cherry picked from commit ba3c80a5ca)
 2015-02-13 16:11:16 +09:00
Tsuyoshi Ozawa 9d57392f5b MAPREDUCE-6221. Stringifier is left unclosed in Chain#getChainElementConf(). Contributed by Ted Yu. 
(cherry picked from commit 9b0ba59b82)
 2015-02-13 02:28:19 +09:00
Tsuyoshi Ozawa 941a923514 MAPREDUCE-4431. mapred command should print the reason on killing already completed jobs. Contributed by Devaraj K. 
(cherry picked from commit ac8d52bf50)
 2015-02-12 20:37:14 +09:00
Tsuyoshi Ozawa 9129b3415c MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl. Contributed by Devaraj K. 
(cherry picked from commit b42d09eb62)
 2015-02-12 20:08:47 +09:00
Devaraj K a00c9362e6 MAPREDUCE-6253. Update use of Iterator to Iterable. Contributed by Ray 
Chiang.

(cherry picked from commit 76e309ead0)
 2015-02-12 13:47:19 +05:30
Tsuyoshi Ozawa b1aad1d941 MAPREDUCE-6237. Multiple mappers with DBInputFormat don't work because of reusing conections. Contributed by Kannan Rajah. 
(cherry picked from commit 241336ca2b)
 2015-02-10 03:53:15 +09:00
yliu 6933975143 MAPREDUCE-6227. DFSIO for truncate. (shv via yliu) 2015-02-08 02:42:10 +08:00
Robert Kanter 46a2027226 MAPREDUCE-6233. org.apache.hadoop.mapreduce.TestLargeSort.testLargeSort failed in trunk (zxu via rkanter) 
(cherry picked from commit e2ee2ff7d7)
 2015-02-05 14:31:44 -08:00
Jason Lowe eb927a1d6b MAPREDUCE-6186. Redundant call to requireJob() while displaying the conf page. Contributed by Rohit Agarwal 
(cherry picked from commit e1990ab427)
 2015-02-05 20:14:13 +00:00
Jason Lowe 2dc4af2b93 MAPREDUCE-6059. Speed up history server startup time (Siqi Li via aw) 
(cherry picked from commit fd57ab2002)

Conflicts:

	hadoop-mapreduce-project/CHANGES.txt
 2015-02-05 16:40:09 +00:00
Akira Ajisaka ad4b243586 MAPREDUCE-5988. Fix dead links to the javadocs in mapreduce project. (aajisaka) 
(cherry picked from commit cc6bbfceae)
 2015-02-04 17:46:39 -08:00
Akira Ajisaka 0a030871dd MAPREDUCE-6243. Fix findbugs warnings in hadoop-rumen. Contributed by Masatake Iwasaki. 
(cherry picked from commit 34fe11c987)
 2015-02-04 09:27:01 -08:00
Akira Ajisaka 8d98e5c960 MAPREDUCE-5800. Use Job#getInstance instead of deprecated constructors. (aajisaka) 
(cherry picked from commit bd69fb2d44)

Conflicts:
	hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java
 2015-02-03 14:35:15 -08:00
Robert Kanter a3a7efe748 MAPREDUCE-6143. add configuration for mapreduce speculative execution in MR2 (zxu via rkanter) 
(cherry picked from commit 8acc5e9b4b)
 2015-02-02 13:52:29 -08:00
Allen Wittenauer a754f94ed7 MAPREDUCE-6151. Update document of GridMix (Masatake Iwasaki via aw) 2015-01-30 11:09:03 -08:00
Allen Wittenauer 3165e778f3 MAPREDUCE-6150. Update document of Rumen (Masatake Iwasaki via aw) 2015-01-29 14:18:25 -08:00
Akira Ajisaka 57172c09e2 MAPREDUCE-6231. Grep example job is not working on a fully-distributed cluster. (aajisaka) 
(cherry picked from commit fe2188a042)
 2015-01-30 01:11:22 +09:00
Jian He 43b3b43cea MAPREDUCE-6230. Fixed RMContainerAllocator to update the new AMRMToken service name properly. Contributed by Jason Lowe 
(cherry picked from commit cff05bff1f)
 2015-01-28 15:52:11 -08:00
Jason Lowe 2cf58ca5a6 MAPREDUCE-6141. History server leveldb recovery store. Contributed by Jason Lowe 
(cherry picked from commit 56b7ec71a6)
 2015-01-26 16:30:10 +00:00
cnauroth 60dc848f23 MAPREDUCE-3283. mapred classpath CLI does not display the complete classpath. Contributed by Varun Saxena. 2015-01-21 13:52:09 -08:00
Akira Ajisaka 2e5eef9da2 MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationID() for logging AttemptId in RMContainerAllocator.java (Contributed by Leitao Guo) 
(cherry picked from commit d336d13678)
 2015-01-14 17:43:25 +09:00
Xuan 0562f382fa MAPREDUCE-6173. Document the configuration of deploying MR over 
distributed cache with enabling wired encryption at the same time.
Contributed by Junping Du.

(cherry picked from commit 10ac5abb86)
 2015-01-13 10:08:24 -08:00
Tsuyoshi Ozawa 132fd6ba58 HADOOP-11032. Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa) 
(cherry picked from commit a6ed4894b5)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/kvtest/KVJob.java
 2015-01-08 15:00:02 +09:00
Jason Lowe c22c27068e MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems. Contributed by Jens Rabe 
(cherry picked from commit a0aeed100b)
 2015-01-06 23:40:42 +00:00
Harsh J 6d65e74670 MAPREDUCE-6149. Document override log4j.properties in MR job. Contributed by Junping Du. 
(cherry picked from commit 6621c3598e)
 2014-12-30 23:13:19 +05:30
Robert Kanter f9341c1e2c MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter) 
(cherry picked from commit 390a7c12f5)
 2014-12-19 15:44:01 -08:00
Robert Kanter 22b38cf29a MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter) 
(cherry picked from commit d9e4d67d18)
 2014-12-19 12:00:00 -08:00
Gera Shegalov 7c7bccfc31 MAPREDUCE-6166. Reducers do not validate checksum of map outputs when fetching directly to disk. (Eric Payne via gera) 
(cherry picked from commit af006937e8)
 2014-12-15 19:21:46 -08:00
Harsh J a3fa1f0761 MAPREDUCE-6194. Bubble up final exception in failures during creation of output collectors. Contributed by Varun Saxena. 
(cherry picked from commit 298d09c9b5)
 2014-12-15 14:27:49 +05:30
Gera Shegalov 6465931c19 MAPREDUCE-4879. TeraOutputFormat may overwrite an existing output directory. (gera) 
(cherry picked from commit 25a0440238)
 2014-12-13 18:12:02 -08:00
Devaraj K 25f4a0193b MAPREDUCE-6046. Change the class name for logs in RMCommunicator. 
Contributed by Sahil Takiar.

(cherry picked from commit 0bd0229110)
 2014-12-12 11:44:00 +05:30
Harsh J 6e06a51e30 MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh) 
(cherry picked from commit cb99f43305)
 2014-12-11 09:46:08 +05:30
Harsh J bb1fedfbc3 MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh) 
(cherry picked from commit 8963515b88)
 2014-12-08 16:00:12 +05:30
Jason Lowe db723a8499 MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov 
(cherry picked from commit 03ab24aa01)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 2014-12-03 17:12:47 +00:00
Jason Lowe b6d7b789bd MAPREDUCE-6160. Potential NullPointerException in MRClientProtocol interface implementation. Contributed by Rohith 
(cherry picked from commit 0c588904f8)
 2014-12-01 22:40:38 +00:00
Jason Lowe 2bdef5697b MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena 
(cherry picked from commit 2b30fb1053)
 2014-12-01 21:52:51 +00:00