merge YARN-82 from trunk. Change the default local and log dirs to be based on hadoop.tmp.dir and yarn.log.dir. (Contributed by Hemanth Yamijala)

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

hadoop-yarn-project/CHANGES.txt

@@ -17,6 +17,9 @@ Release 2.0.3-alpha - Unreleased
     YARN-28. Fixed TestCompositeService to not depend on test-order and thus
     made it pass on JDK7 (Thomas Graves via vinodkv).
 
+    YARN-82. Change the default local and log dirs to be based on
+    hadoop.tmp.dir and yarn.log.dir. (Hemanth Yamijala via sseth)
+
   OPTIMIZATIONS
 
   BUG FIXES 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml

@@ -328,7 +328,7 @@
       be subdirectories of this.
    </description>
     <name>yarn.nodemanager.local-dirs</name>
-    <value>/tmp/nm-local-dir</value>
+    <value>${hadoop.tmp.dir}/nm-local-dir</value>
   </property>
 
   <property>
@@ -370,7 +370,7 @@
       stderr, stdin, and syslog generated by that container.
     </description>
     <name>yarn.nodemanager.log-dirs</name>
-    <value>/tmp/logs</value>
+    <value>${yarn.log.dir}/userlogs</value>
   </property>
 
   <property>