Jian He f21a5236e5 YARN-2229. Changed the integer field of ContainerId to be long type. Contributed by Tsuyoshi OZAWA ... (cherry picked from commit 3122daa802) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/CheckpointAMPreemptionPolicy.java		2014-09-12 10:45:42 -07:00
..
src/main	YARN-2229. Changed the integer field of ContainerId to be long type. Contributed by Tsuyoshi OZAWA	2014-09-12 10:45:42 -07:00
pom.xml	Preparing for 2.6.0 development. Updated versions.	2014-07-03 06:11:57 +00:00