Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 6527be374 -> c9a2e6f5d
HDFS-6806. HDFS Rolling upgrade document should mention the versions available.
Contributed by J.Andreina.
(cherry picked from commit 82db3341bfb344f10c4c6cc8eea0d8c19e05956a)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c9a2e6f5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c9a2e6f5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c9a2e6f5
Branch: refs/heads/branch-2.7
Commit: c9a2e6f5db9a6bdc2f46da30050c9ff980488420
Parents: 6527be3
Author: Akira Ajisaka <[email protected]>
Authored: Tue Mar 10 11:22:11 2015 +0900
Committer: Akira Ajisaka <[email protected]>
Committed: Tue Mar 10 11:27:30 2015 +0900
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9a2e6f5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 76ee828..fb3fefa 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -417,6 +417,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7411. Change decommission logic to throttle by blocks rather than
nodes in each interval. (Andrew Wang via cdouglas)
+ 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.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9a2e6f5/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsRollingUpgrade.xml
----------------------------------------------------------------------
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 1053695..e7d8698 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>,
