MAPREDUCE-5364. Committed to branch-1.2 also.

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

CHANGES.txt

@@ -71,9 +71,6 @@ Release 1.3.0 - unreleased
     HADOOP-9678. TestRPC#testStopsAllThreads intermittently fails on Windows.
     (Ivan Mitic via cnauroth)
 
-    MAPREDUCE-5364. Deadlock between RenewalTimerTask methods cancel() and run(). 
-    (kkambatl via tucu)
-
 Release 1.2.1 - Unreleased 
 
   INCOMPATIBLE CHANGES
@@ -117,6 +114,9 @@ Release 1.2.1 - Unreleased
     MAPREDUCE-5351. Fixed a memory leak in JobTracker due to stable FS objects in
     FSCache. (Sandy Ryza via acmurthy)
 
+    MAPREDUCE-5364. Deadlock between RenewalTimerTask methods cancel() and run(). 
+    (kkambatl via tucu)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES