YARN-1580. Documentation error regarding container-allocation.expiry-interval-ms (Brahma Reddy Battula via junping_du)

(cherry picked from commit 46c7577b9843766b8cc3e81eae1100d4c194286a)

hadoop-yarn-project/CHANGES.txt

@@ -521,6 +521,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3151. On Failover tracking url wrong in application cli for
     KILLED application (Rohith via xgong)
 
+    YARN-1580. Documentation error regarding "container-allocation.expiry-interval-ms" 
+    (Brahma Reddy Battula via junping_du)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

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

@@ -588,7 +588,7 @@
     <description>Interval for the roll over for the master key used to generate
         container tokens. It is expected to be much greater than
         yarn.nm.liveness-monitor.expiry-interval-ms and
-        yarn.rm.container-allocation.expiry-interval-ms. Otherwise the
+        yarn.resourcemanager.rm.container-allocation.expiry-interval-ms. Otherwise the
         behavior is undefined.
     </description>
     <name>yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs</name>