HDFS-5679. TestCacheDirectives should handle the case where native code is not available. (wang)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552461 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10141. Create KeyProvider API to separate encryption key storage
from the applications. (omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552462 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5681. renewLease should not hold fsn write lock. Contributed by Daryn Sharp.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552711 13f79535-47bb-0310-9956-ffa450edef68
YARN-1180. Update capacity scheduler docs to include types on the configs (Chen He via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552788 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5692. Add explicit diagnostics when a task attempt is killed due to speculative execution (Gera Shegalov via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552797 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5691. Fix typo in ShortCircuitLocalRead document. Contributed by Akira Ajisaka.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552802 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5550. Task Status message (reporter.setStatus) not shown in UI with Hadoop 2.0 (Gera Shegalov via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552808 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10169. Remove the unnecessary synchronized in JvmMetrics class. Contributed by Liang Xie.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552820 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2933. Fix incorrect target version in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552837 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5636. Enforce a max TTL per cache pool (awang via cmccabe)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552841 13f79535-47bb-0310-9956-ffa450edef68
YARN-1028. Addendum patch. Added FailoverProxyProvider capability to ResourceManager to help with RM failover.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552920 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch: upstream/trunk