HDFS-7257. Add the time of last HA state transition to NN's /jmx page. Contributed by Charles Lamb.
HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha)
HDFS-7223. Tracing span description of IPC client is too long (iwasakims via cmccabe)
HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone. (clamb via yliu)
YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He.
Updated CHANGES.txt to move YARN-2682 to branch-2.6
HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG level instead of INFO level. Contributed by Xiaoyu Yao.
HDFS-7283. Bump DataNode OOM log from WARN to ERROR. Contributed by Stephen Chu.
YARN-2724. Skipped uploading a local log file to HDFS if exception is raised when opening it. Contributed by Xuan Gong.
HDFS-6904. YARN unable to renew delegation token fetched via webhdfs due to incorrect service port.
HDFS-6904. Added files missing in previous commit.
HADOOP-11228. Winutils task: unsecure path should not call AddNodeManagerAndUserACEsToObject. Contributed by Remus Rusanu
Fix CHANGES.txt for HADOOP-11228
HDFS-6988. Improve HDFS-6581 eviction configuration (Xiaoyu Yao via Colin P. McCabe)
YARN-2703. Added logUploadedTime into LogValue for better display. Contributed by Xuan Gong.
HADOOP-11231. Remove dead code in ServletUtil. Contributed by Li Lu.
Fix CHANGES.txt for HADOOP-112321 and HADOOP-10748.
YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha)
v.7: used 2 threads to accomplish the same race condition handling

- switched from AtomicBoolean to Lock as it's semantically identical and clearer in intention
Merge remote-tracking branch 'upstream/trunk' into sharedcache-3-YARN-2183-cleaner