HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is required on Mac. Contributed by Chris Nauroth.
HADOOP-11145. TestFairCallQueue fails. Contributed by Akira AJISAKA.
Preparing to branch hadoop-2.6
HDFS-7167. NPE while running Mover if the given path is for a file. Contributed by Jing Zhao.
YARN-2610. Hamlet should close table tags. (Ray Chiang via kasha)
YARN-2627. Added the info logs of attemptFailuresValidityInterval and number of previous failed attempts. Contributed by Xuan Gong.
YARN-2387. Resource Manager crashes with NPE due to lack of synchronization. Contributed by Mit Desai
YARN-2594. Potential deadlock in RM when querying ApplicationResourceUsageReport. (Wangda Tan via kasha)
HADOOP-11156. DelegateToFileSystem should implement getFsStatus(final Path f). Contributed by Zhihai Xu.
YARN-2602. Fixed possible NPE in ApplicationHistoryManagerOnTimelineStore. Contributed by Zhijie Shen
HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang)
HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel)
Merge branch 'trunk' into HDFS-6581
HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal)
Merge branch 'trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
HDFS-7171. Fix Jenkins failures in HDFS-6581 branch. (Arpit Agarwal)