svn merge -c 1415480 from trunk for HDFS-4242. Map.Entry is incorrectly used in LeaseManager since the behavior of it is undefined after the iteration or modifications of the map.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415481 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1415591:1415592 from trunk to branch-2. Fixes: YARN-187. Add hierarchical queues to the fair scheduler. Contributed by Sandy Ryza.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415593 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
svn merge -c 1415742 FIXES: YARN-251. Proxy URI generation fails for blank tracking URIs. Contributed by Tom White


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415745 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1415799 from trunk for HDFS-4213. Add an API to hsync for updating the last block length at the namenode.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415801 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0. (Ravi Prakash via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415863 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
svn merge -c 1416034 FIXES: HDFS-4247. saveNamespace should be tolerant of dangling lease (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416035 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
svn merge -c 1416064 from trunk for HDFS-4248. Renaming directories may incorrectly remove the paths in leases under the tree.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416066 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
HDFS-4231. BackupNode: Introduce BackupState. Contributed by Konstantin Shvachko.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416289 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
Merge -r 1416483:1416484 from trunk to branch-2. Fixes: YARN-72. NM should handle cleaning up containers when it shuts down. Contributed by Sandy Ryza.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416485 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9090. Merging change 1416538 from trunk to release 2.0.3

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416543 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
HDFS-4199. Provide test for HdfsVolumeId. Contributed by Ivan A. Veselovsky.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417264 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
HDFS-3049. During the normal NN startup process, fall back on a different edit log if we see one that is corrupt. Contributed by Colin Patrick McCabe.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417588 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3571. Allow EditLogFileInputStream to read from a remote URL. Contributed by Todd Lipcon.

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