You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/10/10 21:01:06 UTC
[27/50] [abbrv] git commit: HDFS-7176. The namenode usage message
doesn't include "-rollingupgrade started" (cmccabe) (cherry picked from
commit dd1b8f2ed8a86871517c730a9f370aca4b763514) (cherry picked from commit
1725d56132c54d9ccab9e25b1ea5ad5c04c43795
HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe)
(cherry picked from commit dd1b8f2ed8a86871517c730a9f370aca4b763514)
(cherry picked from commit 1725d56132c54d9ccab9e25b1ea5ad5c04c43795)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa9e4e2c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa9e4e2c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa9e4e2c
Branch: refs/heads/champlain
Commit: fa9e4e2cdbf04314faa5ac740be3b238d3d29f21
Parents: 54465f7
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Wed Oct 1 14:53:44 2014 -0700
Committer: Jitendra Pandey <Ji...@Jitendra-Pandeys-MacBook-Pro-4.local>
Committed: Wed Oct 8 23:59:26 2014 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/namenode/NameNode.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa9e4e2c/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 7a33eeb..723aafc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -550,6 +550,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7162. Wrong path when deleting through fuse-dfs a file which already
exists in trash (Chenging Liu via cmccabe)
+ HDFS-7176. The namenode usage message doesn't include "-rollingupgrade
+ started" (cmccabe)
+
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HDFS-6387. HDFS CLI admin tool for creating & deleting an
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa9e4e2c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 523529d..ac86e6b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -217,7 +217,8 @@ public class NameNode implements NameNodeStatusMXBean {
+ StartupOption.ROLLBACK.getName() + "] | \n\t["
+ StartupOption.ROLLINGUPGRADE.getName() + " <"
+ RollingUpgradeStartupOption.DOWNGRADE.name().toLowerCase() + "|"
- + RollingUpgradeStartupOption.ROLLBACK.name().toLowerCase() + "> ] | \n\t["
+ + RollingUpgradeStartupOption.ROLLBACK.name().toLowerCase() + "|"
+ + RollingUpgradeStartupOption.STARTED.name().toLowerCase() + "> ] | \n\t["
+ StartupOption.FINALIZE.getName() + "] | \n\t["
+ StartupOption.IMPORT.getName() + "] | \n\t["
+ StartupOption.INITIALIZESHAREDEDITS.getName() + "] | \n\t["