Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9907D174DD for ; Wed, 1 Oct 2014 21:54:03 +0000 (UTC) Received: (qmail 88572 invoked by uid 500); 1 Oct 2014 21:54:03 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 88489 invoked by uid 500); 1 Oct 2014 21:54:03 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 88480 invoked by uid 99); 1 Oct 2014 21:54:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2014 21:54:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 03DB19C34E6; Wed, 1 Oct 2014 21:54:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cmccabe@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe) Date: Wed, 1 Oct 2014 21:54:02 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 875aa797c -> dd1b8f2ed HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd1b8f2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd1b8f2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd1b8f2e Branch: refs/heads/trunk Commit: dd1b8f2ed8a86871517c730a9f370aca4b763514 Parents: 875aa79 Author: Colin Patrick Mccabe Authored: Wed Oct 1 14:53:44 2014 -0700 Committer: Colin Patrick Mccabe Committed: Wed Oct 1 14:53:44 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/dd1b8f2e/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 323b1b7..e4d978f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -891,6 +891,9 @@ Release 2.6.0 - UNRELEASED HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. (Chris Nauroth via wheat9) + 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/dd1b8f2e/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 63da66e..3f66301 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 @@ -218,7 +218,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["