svn merge -c 1492941 from trunk for HDFS-4845. FSNamesystem.deleteInternal should acquire write-lock before changing the inode map.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492942 13f79535-47bb-0310-9956-ffa450edef68
YARN-792. Moved NodeHealthStatus from yarn.api.record to yarn.server.api.record. Contributed by Jian He.
svn merge --ignore-ancestry -c 1492943 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492944 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1492958 from trunk to branch-2 to fix YARN-812. Set default logger for application summary logger to hadoop.root.logger. Contributed by Siddarth Seth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492959 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1492962 from trunk to branch-2 to fix MAPREDUCE-5319. Set user.name in job.xml. Contributed by Xuan Gong.

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