Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1606855 merging from trunk to branch-2 to fix: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/branches/branch-2@1606856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2014-06-30 18:18:53 +00:00
parent c2eaeadaab
commit 905b8c0895
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -484,6 +484,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)

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
View File

@ -293,7 +293,7 @@ public class DFSAdmin extends FsShell {
static final String USAGE = "-"+NAME+" [<query|prepare|finalize>]";
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