Merge -r 1294756:1294757 from trunk to branch. FIXES: HADOOP-8098

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294775 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1294783:1294784 from trunk to branch. FIXES: HADOOP-8104

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294788 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1294808 trunk to branch 0.23 FIXES MAPREDUCE-3816 capacity scheduler web ui bar graphs for used capacity wrong (tgraves via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294814 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1294808 trunk to branch 0.23.2 FIXES MAPREDUCE-3816 capacity scheduler web ui bar graphs for used capacity wrong (tgraves via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1294815 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-3930 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294903 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-3930 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1294904 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3931. Changed PB implementation of LocalResource to take locks so that race conditions don't fail tasks by inadvertantly changing the timestamps. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1294970 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1294971 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3931. Changed PB implementation of LocalResource to take locks so that race conditions don't fail tasks by inadvertantly changing the timestamps. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1294970 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294973 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1295061. Merge HADOOP-7940 into branch-0.23. (Csaba Miklos via harsh).

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295064 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1295147 trunk to branch 23 FIXES MAPREDUCE-3687.  If AM dies before it returns new tracking URL, proxy redirects to http://N/A/ and doesn't return error code (Ravi Prakash via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295149 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1295147 trunk to branch 23.2 FIXES MAPREDUCE-3687.  If AM dies before it returns new tracking URL, proxy redirects to http://N/A/ and doesn't return error code (Ravi Prakash via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1295150 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1295162:1295163 from branch-0.23 to branch-0.23.2. FIXES: MAPREDUCE-3920

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1295164 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1295177:1295178 from trunk to branch. FIXES: MAPREDUCE-3933

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295179 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2991. Fix case where OP_ADD would not be logged in append(). Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1295210 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2991. Fix case where OP_ADD would not be logged in append(). Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295213 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2992. svn merge -c 1295227 from trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295231 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3020. Fix editlog to automatically sync when buffer is full. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295241 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1295240 from trunk for HADOOP-8118.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295242 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1295244:1295245 from trunk to branch. FIXES: MAPREDUCE-3728

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