hadoop/hadoop-mapreduce-project
Karthik Kambatla 2d8f9e3fd9 MAPREDUCE-6302. Incorrect headroom can lead to a deadlock between map and reduce allocations. (kasha)
(cherry picked from commit 4aa9b3e75c)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
2015-10-09 07:54:47 -07:00
..
.eclipse.templates
bin MAPREDUCE-6415. Create a tool to combine aggregated logs into HAR files. (Robert Kanter via kasha) 2015-09-09 17:49:23 -07:00
conf HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA. 2014-11-12 21:44:05 -08:00
dev-support MAPREDUCE-6421. Fix findbugs warning in RMContainerAllocator.reduceNodeLabelExpression. Contributed by Brahma Reddy Battula. 2015-07-13 14:29:39 +09:00
hadoop-mapreduce-client MAPREDUCE-6302. Incorrect headroom can lead to a deadlock between map and reduce allocations. (kasha) 2015-10-09 07:54:47 -07:00
hadoop-mapreduce-examples MAPREDUCE-6389. Fix BaileyBorweinPlouffe CLI usage message. Contributed by 2015-06-10 21:06:35 +05:30
lib/jdiff JDiff output for release 0.22.0 2011-12-12 05:47:46 +00:00
.gitignore
CHANGES.txt MAPREDUCE-6302. Incorrect headroom can lead to a deadlock between map and reduce allocations. (kasha) 2015-10-09 07:54:47 -07:00
pom.xml HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:55:52 -07:00