Merge -c 1497918 from branch-1 to branch-1.2 to fix MAPREDUCE-5260. Fix JvmManager to deal better with corner-cases in shutting down. Contributed by zhaoyunjiong.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1497919 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1497933 from branch-1 to branch-1.2 to fix MAPREDUCE-5318. Escape ampersand in JSPUtil. Contributed by Bohou Li.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1497935 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1497938 from branch-1 to branch-1.2 to fix HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather than throw EOF at end of file. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1497939 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9665. Committing new test case which was missed.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1497961 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1497961:1497963 from branch-1 to branch-1.2 to fix MAPREDUCE-5351. Fixed a memory leak in JobTracker due to stable FS objects in FSCache. Contributed by Sandy Ryza.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1497964 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1499566 from branch-1 to branch-1.2 to fix MAPREDUCE-5364. Deadlock between RenewalTimerTask methods cancel() and run(). (kkambatl via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1499899 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5364. Committed to branch-1.2 also.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1499901 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1499902 from branch-1 to branch-1.2 to fix MAPREDUCE-5375. Use short name for renewing delegation tokens. Contributed by Venkat Ranganathan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1499903 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1499904 from branch-1 to branch-1.2 to fix MAPREDUCE-5351. Addedndum patch to ensure we don't incorrectly close wrong filesystems. Contributed by Sandy Ryza.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1499905 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1499906 from branch-1 to branch-1.2 to fix MAPREDUCE-5368. Reduce memory footprint of JobTracker by using non-default values for hash-tables to store Locality and Avataar for TaskAttempts. Contributed by zhaoyunjiong.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1499907 13f79535-47bb-0310-9956-ffa450edef68
Preparing for release 1.2.1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1500333 13f79535-47bb-0310-9956-ffa450edef68
Fix up a little test failure. Contributed by atm.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1500335 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo. Contributed by Liang Xie and Jason Lowe.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1500337 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer. Contributed by Vinod Kumar Vavilapalli.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1500340 13f79535-47bb-0310-9956-ffa450edef68
Release Notes for release candidate 1.2.1-rc0, and minor tweaks to CHANGES.txt for consistency.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1503091 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. Contributed by Giridharan Kesavan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1503152 13f79535-47bb-0310-9956-ffa450edef68
JDiff output for release 1.2.1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1510328 13f79535-47bb-0310-9956-ffa450edef68
corrected minor typo in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1510332 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5450. Unnecessary Configuration instantiation in IFileInputStream slows down merge. Contributed by Stanislav Barton.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1511943 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9863. Backport HADOOP-8686 to support BigEndian on ppc64. 
(Yu Li via eyang)



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