MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1399978 13f79535-47bb-0310-9956-ffa450edef68
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-0.23@1400191 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-0.23@1400197 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1393769 FIXES: YARN-102. Move the apache header to the top of the file in MemStore.java. (Contributed by Devaraj K)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1400215 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1393777 FIXES: HDFS-3996. Add debug log removed in HDFS-3873 back. Contributed by Eli Collins


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1400216 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1394864 FIXES: HDFS-3483. Better error message when hdfs fsck is run against a ViewFS config. Contributed by Stephen Fritz.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1400218 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1394881 FIXES: HADOOP-8889. Upgrade to Surefire 2.12.3. Contributed by Todd Lipcon.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1400224 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-0.23@1400267 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-0.23@1400554 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-0.23@1401059 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-0.23@1401089 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1401309  FIXES: HDFS-4090. getFileChecksum() result incompatible when called against zero-byte files. (Kihwal Lee via daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401322 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1401325 FIXES: HADOOP-8962. RawLocalFileSystem.listStatus fails when a child filename contains a colon (jlowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401328 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1401483 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401485 13f79535-47bb-0310-9956-ffa450edef68
Updating credits for MAPREDUCE-4229.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401487 13f79535-47bb-0310-9956-ffa450edef68
YARN-177. CapacityScheduler - adding a queue while the RM is running has wacky results (acmurthy vai tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401699 13f79535-47bb-0310-9956-ffa450edef68
YARN-178. Fix custom ProcessTree instance creation (Radim Kolar via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401701 13f79535-47bb-0310-9956-ffa450edef68
YARN-180. Capacity scheduler - containers that get reserved create container token to early (acmurthy and bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401706 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1401731 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli


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