YARN-412. Pushing to 2.0.5-beta only.

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

hadoop-yarn-project/CHANGES.txt

@@ -170,6 +170,10 @@ Release 2.0.5-beta - UNRELEASED
     does not have permission causes the client to wait forever.
     (shenhong via tomwhite)
 
+    YARN-412. Fixed FifoScheduler to check hostname of a NodeManager rather
+    than its host:port during scheduling which caused incorrect locality for
+    containers. (Roger Hoover via acmurthy)
+    
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -188,10 +192,6 @@ Release 2.0.4-alpha - UNRELEASED
     YARN-470. Support a way to disable resource monitoring on the NodeManager.
     (Siddharth Seth via hitesh)
     
-    YARN-412. Fixed FifoScheduler to check hostname of a NodeManager rather
-    than its host:port during scheduling which caused incorrect locality for
-    containers. (Roger Hoover via acmurthy)
-    
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES