HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a default value of '*'. Contributed by Roman Shaposhnik.
svn merge --ignore-ancestry -c 1462417 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1462419 13f79535-47bb-0310-9956-ffa450edef68
Backport of
    HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1463292 13f79535-47bb-0310-9956-ffa450edef68
Updating MR CHANGES.txt, as per SVN logs there are not changes in this branch at the moment

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1463324 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1463804 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1463828 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1463830 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5083. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1464637 13f79535-47bb-0310-9956-ffa450edef68
merge YARN-470 from trunk. Support a way to disable resource monitoring on the NodeManager. (sseth)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1464771 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c1465121 from trunk

HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. Contributed by Jagane Sundar



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1465124 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c1455316 from trunk

HADOOP-9379. capture the ulimit info after printing the log to the console. (Arpit Gupta via suresh)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1465309 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1461541 ../../trunk/


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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1466317 13f79535-47bb-0310-9956-ffa450edef68
Release notes for 2.0.4-alpha.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1466318 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9467. Metrics2 record filter should check name as well as tags. (Ganeshan Iyler via llu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1466384 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1467124 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1467127 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9471. hadoop-client wrongfully excludes jetty-util JAR, breaking webhdfs. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1466763 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1467137 13f79535-47bb-0310-9956-ffa450edef68
Removing 2.0.5 change-set from CHANGES.txt from all projects on branch-2.0.4-alpha.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1467142 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1467244 from trunk to branch-2.0.4-alpha to fix YARN-412. Fixed FifoScheduler to check hostname of a NodeManager rather than its host:port during scheduling which caused incorrect locality for containers. Contributed by Roger Hoover.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1467246 13f79535-47bb-0310-9956-ffa450edef68
Re-generated releasenotes.html for hadoop-2.0.4-alpha-rc1.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1467248 13f79535-47bb-0310-9956-ffa450edef68
YARN-412. Pushing to 2.0.5-beta only.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1467469 13f79535-47bb-0310-9956-ffa450edef68
Re-generated releasenotes.html for hadoop-2.0.4-alpha-rc2.

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