hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core
Jason Lowe 0a405c4f71 MAPREDUCE-6724. Single shuffle to memory must not exceed Integer#MAX_VALUE. (Haibo Chen via gera)
(cherry picked from commit 6890d5b472)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
2016-10-28 14:40:28 +00:00
..
src MAPREDUCE-6724. Single shuffle to memory must not exceed Integer#MAX_VALUE. (Haibo Chen via gera) 2016-10-28 14:40:28 +00:00
.gitattributes MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth. 2014-10-09 22:27:40 -07:00
pom.xml MAPREDUCE-6310. Add jdiff support to MapReduce. (Li Lu/vinodkv via wangda) 2016-08-19 16:49:54 -07:00