git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/tags/release-2.4.1@1606633 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/tags/release-2.4.1-rc1@1604318 13f79535-47bb-0310-9956-ffa450edef68

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

HDFS-6527. Edit log corruption due to defered INode removal. Contributed by Jing Zhao and Kihwal Lee.

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

MAPREDUCE-5830. Added back the private API HostUtil.getTaskLogUrl(..) for binary compatibility with older clients like Hive 0.13. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1604232 ../branch-2.4


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

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

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

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

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

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

svn merge --ignore-ancestry -c 1596724 ../../trunk/


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

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

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

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

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

svn merge -r 1595979:1595984 merging from branch-2 to branch-2.4 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam.

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

Merge r1595744 from trunk. HDFS-6325. Append should fail if the last block has insufficient number of replicas (Keith Pak via cos)

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

Merge r1595416 from branch-2: Wrong field is referenced in GetApplicationsRequestPBImpl#mergeLocalToBuilder (Contributed by Hong Zhiguo)

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

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

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

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

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

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

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

during merge. Contributed by Todd Lipcon


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

YARN-1986. In Fifo Scheduler, node heartbeat in between creating app and attempt causes NPE (Hong Zhiguo via Sandy Ryza)

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

capacity for preemption. Contributed by Carlo Curino


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

YARN-1861. Fixed a bug in RM to reset leader-election on fencing that was causing both RMs to be stuck in standby mode when automatic failover is enabled. Contributed by Karthik Kambatla and Xuan Gong.
svn merge --ignore-ancestry -c 1594356 ../../trunk/


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

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

Merge r1594086 from branch-2. YARN-2016. Fix a bug in GetApplicationsRequestPBImpl to add the missed fields to proto. Contributed by Junping Du

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

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

Merge r1593875 from branch-2. YARN-1975. Fix yarn application CLI to print the scheme of the tracking url of failed/killed applications. Contributed by Junping Du

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

YARN-1962. Changed Timeline Service client configuration to be off by default given the non-readiness of the feature yet. Contributed by Mohammad Kamrul Islam.
svn merge --ignore-ancestry -c 1593750 ../../trunk/


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

YARN-1701. Improved default paths of the timeline store and the generic history store. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1593481 ../../trunk/


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

HDFS-6313. WebHdfs may use the wrong NN when configured for multiple HA NNs. Contributed by Kihwal Lee.

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

svn merge -c 1593470 merging from trunk to branch-2 to fix:HDFS-6329. WebHdfs does not work if HA is enabled on NN but logical URI is not configured. Contributed by Kihwal Lee.

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

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

Merge r1592198 from branch-2: YARN-1201. TestAMAuthorization fails with local hostname cannot be resolved. (Wangda Tan via junping_du)

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

YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1591416 ../../trunk/


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

YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover happens right at the time of shutdown. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1591071 ../../trunk/


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