YARN-2214. FairScheduler: preemptContainerPreCheck() in FSParentQueue delays convergence towards fairness. (Ashwin Shankar via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613464 13f79535-47bb-0310-9956-ffa450edef68
YARN-2335. Annotate all hadoop-sls APIs as @Private. (Wei Yan via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613480 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1613486 from hadoop/common/trunk:
HDFS-6752. Avoid Address bind errors in TestDatanodeConfig#testMemlockLimit (vinayakumarb)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613487 13f79535-47bb-0310-9956-ffa450edef68
Fix up HDFS CHANGES.txt for 2.5.0

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613495 13f79535-47bb-0310-9956-ffa450edef68
Fix up Common CHANGES.txt for 2.5.0

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613499 13f79535-47bb-0310-9956-ffa450edef68
Merge r1613515 from trunk. YARN-2211. Persist AMRMToken master key in RMStateStore for RM recovery. Contributed by Xuan Gong

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613516 13f79535-47bb-0310-9956-ffa450edef68