From e8186a9deea3fb0a0ad69b0b527231af87bb330b Mon Sep 17 00:00:00 2001 From: Kihwal Lee Date: Mon, 30 Jun 2014 18:17:56 +0000 Subject: [PATCH] HDFS-6558. Missing newline in the description of dfsadmin -rollingUpgrade. Contributed by Chen He. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1606855 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 48b6b16d83e..4938a6efdd6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -736,6 +736,9 @@ Release 2.5.0 - UNRELEASED HDFS-6418. Regression: DFS_NAMENODE_USER_NAME_KEY missing (szetszwo via stevel) + HDFS-6558. Missing newline in the description of dfsadmin -rollingUpgrade. + (Chen He via kihwal) + BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index 2c1bf038cc4..294e91ba10b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -293,7 +293,7 @@ public class DFSAdmin extends FsShell { static final String USAGE = "-"+NAME+" []"; static final String DESCRIPTION = USAGE + ":\n" + " query: query the current rolling upgrade status.\n" - + " prepare: prepare a new rolling upgrade." + + " prepare: prepare a new rolling upgrade.\n" + " finalize: finalize the current rolling upgrade."; /** Check if a command is the rollingUpgrade command