svn merge -c 1379498. FIXES: YARN-63. RMNodeImpl is missing valid transitions from the UNHEALTHY state (Jason Lowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379500 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379537 FIXES: HADOOP-8727. Gracefully deprecate dfs.umaskmode in 2.x onwards (Harsh J via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379538 13f79535-47bb-0310-9956-ffa450edef68
YARN-60. Fixed a bug in ResourceManager which causes all NMs to get NPEs and thus causes all containers to be rejected. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1379550 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379551 13f79535-47bb-0310-9956-ffa450edef68
YARN-60: Fix minor merge conflict (bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379558 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379565 FIXES: YARN-66. aggregated logs permissions not set properly (tgraves via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379567 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379584 FIXES: MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379585 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3833. Merging 1379525 from trunk. Contributed by Brandon Li

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379594 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1379598:1379599 from trunk. FIXES: MAPREDUCE-4611

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379602 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379615 FIXES: HDFS-3873. Hftp assumes security is disabled if token fetch fails (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379618 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1379623 FIXES: HDFS-3852. TestHftpDelegationToken is broken after HADOOP-8225 (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379626 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3466. Get HTTP kerberos principal from the web authentication keytab.
(omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379648 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3879. Fix findbugs warning in TransferFsImage on branch-2. Contributed by Eli Collins


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