From fd834915f2b45c9aa874ed699ae3bea6913766a2 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 30 May 2017 18:05:05 +0900
Subject: [PATCH] Update CHANGES.txt for YARN-6304.

---
 hadoop-yarn-project/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 47d4cae8323..1eb4855df01 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -99,6 +99,9 @@ Release 2.7.4 - UNRELEASED
     YARN-6615. AmIpFilter drops query parameters on redirect. (Wilfred
     Spiegelenburg via jlowe)
 
+    YARN-6304. Skip rm.transitionToActive call to RM if RM is already active.
+    (Rohith Sharma K S via junping_du)
+
 Release 2.7.3 - 2016-08-25
 
   INCOMPATIBLE CHANGES