MAPREDUCE-4049. Experimental api to allow for alternate shuffle plugins. Contributed by Anver BenHanoch.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438793 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4809. Change visibility of classes for pluggable sort changes. (masokan via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438794 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438795 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438796 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438800 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1438808 from trunk for HDFS-4443. Remove a trailing '`' character from the HTML code generated by NamenodeJspHelper.generateNodeData(..).


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438809 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4259. Improve pipeline DN replacement failure message. Contributed by Harsh J. (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439127 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9241. DU refresh interval is not configurable. Contributed by Harsh J. (harsh)

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439531 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4444. Mrege 1439559 from trunk.

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-4803 from trunk. Remove duplicate copy of TestIndexCache. Contributed by Mariappan Asokan


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439591 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9255. relnotes.py missing last jira (tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439601 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1439652:1439653 Merging YARN-133

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439655 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
Revert HADOOP-9241 from branch-2 as well.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439772 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9190. packaging docs is broken. (Andy Isaacson via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439966 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440080 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1440191:1440192 from trunk to branch-2 to fix HDFS-4288

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440194 13f79535-47bb-0310-9956-ffa450edef68
merge HADOOP-9221 from trunk. Convert remaining xdocs to APT.


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