MAPREDUCE-3614. Fixed MR AM to close history file quickly and send a correct final state to the RM when it is killed. Contributed by Ravi Prakash.
svn merge --ignore-ancestry -c 1296747 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296749 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296835 from trunk to branch-0.23 to fix MAPREDUCE-3929. Fixed output of 'bin/mapred queue -showacl' command to clarify ACLs for users.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296836 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296835 from trunk to branch-0.23.2 to fix MAPREDUCE-3929. Fixed output of 'bin/mapred queue -showacl' command to clarify ACLs for users.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296837 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296861 from trunk to branch-0.23 to fix HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296862 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296861 from trunk to branch-0.23.2 to fix HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296863 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296878 from trunk to branch-0.23 to fix MAPREDUCE-3960. Fix web-proxy to forward request to AM with configured hostname or IP.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296880 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296878 from trunk to branch-0.23.2 to fix MAPREDUCE-3960. Fix web-proxy to forward request to AM with configured hostname or IP.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296881 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296898 from trunk to branch-0.23 to fix MAPREDUCE-3897. Fixed computation of maxActiveAppsPerUser for queues by using capacity and not max-capacity since we are already scaling it by userLimitFactor.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296899 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296898 from trunk to branch-0.23.2 to fix MAPREDUCE-3897. Fixed computation of maxActiveAppsPerUser for queues by using capacity and not max-capacity since we are already scaling it by userLimitFactor.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296900 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296902 from trunk to branch-0.23 to fix MAPREDUCE-3497. Added docs for YARN CLI.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296903 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296902 from trunk to branch-0.23.2 to fix MAPREDUCE-3497. Added docs for YARN CLI.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296904 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296905 from trunk to branch-0.23 to fix HADOOP-8137. Added links to CLI manuals to the site.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296906 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1296905 from trunk to branch-0.23.2 to fix HADOOP-8137. Added links to CLI manuals to the site.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1296907 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3009. Fixed node link on JobHistory webapp. Contributed by Chackaravarthy.
svn merge --ignore-ancestry -c 1297149 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297150 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3009. Fixed node link on JobHistory webapp. Contributed by Chackaravarthy.
svn merge --ignore-ancestry -c 1297149 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1297154 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3954. Added new envs to separate heap size for different daemons started via bin scripts. Contributed by Robert Joseph Evans.
svn merge --ignore-ancestry -c 1297174 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1297175 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3954. Added new envs to separate heap size for different daemons started via bin scripts. Contributed by Robert Joseph Evans.
svn merge --ignore-ancestry -c 1297174 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297176 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1297248 from trunk to branch-0.23 FIXES MAPREDUCE-3964. ResourceManager does not have JVM metrics (Jason Lowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297250 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1297248 from trunk to branch-0.23.2 FIXES MAPREDUCE-3964. ResourceManager does not have JVM metrics (Jason Lowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1297251 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1297274 from trunk to branch-0.23 FIXES HADOOP-8064. Remove unnecessary dependency on w3c.org in document processing (Khiwal Lee via bobby)


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