MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489187 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489219 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489227 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5299. Changed jira number for the commit in CHANGES.txt.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489229 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5300. Moved to INCOMPATIBLE CHANGES section in CHANGES.txt.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489232 13f79535-47bb-0310-9956-ffa450edef68
YARN-726. Fix queue & finish time fields in web-ui for ResourceManager. Contributed by Mayank Bansal.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489234 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5245. Added back constants to JobConf to fix incompatibilities. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489236 13f79535-47bb-0310-9956-ffa450edef68
YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He.
MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489257 13f79535-47bb-0310-9956-ffa450edef68
Move HADOOP-9287 in CHANGES.txt after committing to branch-2


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489258 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9481. Move from trunk to release 2.1.0 section

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489261 13f79535-47bb-0310-9956-ffa450edef68
YARN-757. Changed TestRMRestart to use the default scheduler to avoid test failures. Contributed by Bikas Saha.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489268 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5283. Over 10 different tests have near identical implementations of AppContext. Committed by Sandy Ryza


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489271 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth.
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489283 13f79535-47bb-0310-9956-ffa450edef68
YARN-635 and MAPREDUCE-5301. Bug fix as the committed patch ended up being stale.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489287 13f79535-47bb-0310-9956-ffa450edef68
YARN-756. Move Preemption* records to yarn.api where they really belong. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489290 13f79535-47bb-0310-9956-ffa450edef68
YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. Contributed by Bikas Saha.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489295 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
YARN-742. Log aggregation causes a lot of redundant setPermission calls. Contributed by Jason Lowe.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489596 13f79535-47bb-0310-9956-ffa450edef68