From 2d3c5507ce81582633ed3ff47757afd6e8f7abf7 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 10 Mar 2015 11:22:11 +0900
Subject: [PATCH] HDFS-6806. HDFS Rolling upgrade document should mention the
 versions available. Contributed by J.Andreina.

(cherry picked from commit 82db3341bfb344f10c4c6cc8eea0d8c19e05956a)
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                   | 3 +++
 .../hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml          | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index cc8a69e585b..9c2f9791cb5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -432,6 +432,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-7898. Change TestAppendSnapshotTruncate to fail-fast.
     (Tsz Wo Nicholas Sze via jing9)
 
+    HDFS-6806. HDFS Rolling upgrade document should mention the versions
+    available. (J.Andreina via aajisaka)
+
   OPTIMIZATIONS
 
     HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml b/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml
index 1053695b4f5..e7d86986543 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml
@@ -47,7 +47,9 @@
     These two capabilities make it feasible to upgrade HDFS without incurring HDFS downtime.
     In order to upgrade a HDFS cluster without downtime, the cluster must be setup with HA.
   </p>
-
+  <p>
+    Note that rolling upgrade is supported only from Hadoop-2.4.0 onwards.
+  </p>
   <subsection name="Upgrade without Downtime" id="UpgradeWithoutDowntime">
   <p>
     In a HA cluster, there are two or more <em>NameNodes (NNs)</em>, many <em>DataNodes (DNs)</em>,