svn merge -c 1400189 FIXES: YARN-163. Retrieving container log via NM webapp can hang with multibyte characters in log (jlowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400190 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1400192 FIXES: MAPREDUCE-4479. Fix parameter order in assertEquals() in TestCombineInputFileFormat.java (Mariappan Asokan via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400194 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1400264 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68
merge YARN-136 from trunk. Make ClientToAMTokenSecretManager part of RMContext (Contributed by Vinod Kumar Vavilapalli)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400279 13f79535-47bb-0310-9956-ffa450edef68
HDFS-8948. Merging change 1400324 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400327 13f79535-47bb-0310-9956-ffa450edef68
YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400337 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1400345 from trunk for HDFS-4088. Remove "throws QuotaExceededException" from an INodeDirectoryWithQuota constructor.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400346 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1400347 from trunk for adding target, .classpath, .project and .settings to svn:ignore.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400348 13f79535-47bb-0310-9956-ffa450edef68
Merge 1400552 from trunk to change incorrect jira number HADOOP-8923 to HADOOP-8932 introduced in commit r1398883.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400553 13f79535-47bb-0310-9956-ffa450edef68
Merge (r1400578) from trunk HDFS-4022. Replication not happening for appended block. Contributed by Vinay.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400581 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8951. Merge 1400921 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400926 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1400986 from trunk for HDFS-4099. Clean up replication code and add more javadoc.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400987 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
YARN-174. Modify NodeManager to pass the user's configuration even when rebooting. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1401086 ../../trunk/


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