Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 106B42009A8 for ; Tue, 17 May 2016 20:59:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0EF561609F5; Tue, 17 May 2016 18:59:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 59A581607A8 for ; Tue, 17 May 2016 20:59:20 +0200 (CEST) Received: (qmail 13160 invoked by uid 500); 17 May 2016 18:59:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 13151 invoked by uid 99); 17 May 2016 18:59:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2016 18:59:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62A14DFB93; Tue, 17 May 2016 18:59:19 +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: hadoop git commit: HDFS-10404. Fix formatting of CacheAdmin command usage help text (Yiqun Lin via cmccabe) Date: Tue, 17 May 2016 18:59:19 +0000 (UTC) archived-at: Tue, 17 May 2016 18:59:21 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 9c47862d8 -> 6ebb92c9c HDFS-10404. Fix formatting of CacheAdmin command usage help text (Yiqun Lin via cmccabe) (cherry picked from commit 7cd5ae62f639a857f24f5463f2aefc099c631a14) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6ebb92c9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ebb92c9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ebb92c9 Branch: refs/heads/branch-2 Commit: 6ebb92c9c1b36ee353e45a6e2dafe6fbb9a15715 Parents: 9c47862 Author: Colin Patrick Mccabe Authored: Tue May 17 11:10:48 2016 -0700 Committer: Colin Patrick Mccabe Committed: Tue May 17 11:59:10 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java | 6 ++++-- .../src/site/markdown/CentralizedCacheManagement.md | 2 +- .../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ebb92c9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java index 6888ea8..7912c3a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java @@ -443,7 +443,8 @@ public class CacheAdmin extends Configured implements Tool { @Override public String getShortUsage() { return "[" + getName() - + " [-stats] [-path ] [-pool ] [-id ]\n"; + + " [-stats] [-path ] [-pool ] [-id ]" + + "]\n"; } @Override @@ -554,7 +555,8 @@ public class CacheAdmin extends Configured implements Tool { public String getShortUsage() { return "[" + NAME + " [-owner ] " + "[-group ] [-mode ] [-limit ] " + - "[-maxTtl ]\n"; + "[-maxTtl ]" + + "]\n"; } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ebb92c9/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/CentralizedCacheManagement.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/CentralizedCacheManagement.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/CentralizedCacheManagement.md index 72c125d..210d25c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/CentralizedCacheManagement.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/CentralizedCacheManagement.md @@ -157,7 +157,7 @@ List cache directives. #### addPool -Usage: `hdfs cacheadmin -addPool [-owner ] [-group ] [-mode ] [-limit ] [-maxTtl +Usage: `hdfs cacheadmin -addPool [-owner ] [-group ] [-mode ] [-limit ] [-maxTtl ]` Add a new cache pool. http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ebb92c9/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md index cc426c6..36ec7ff 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md @@ -312,10 +312,10 @@ Usage: hdfs cacheadmin [-addDirective -path -pool [-force] [-replication ] [-ttl ]] hdfs cacheadmin [-modifyDirective -id [-path ] [-force] [-replication ] [-pool ] [-ttl ]] - hdfs cacheadmin [-listDirectives [-stats] [-path ] [-pool ] [-id ] + hdfs cacheadmin [-listDirectives [-stats] [-path ] [-pool ] [-id ]] hdfs cacheadmin [-removeDirective ] hdfs cacheadmin [-removeDirectives -path ] - hdfs cacheadmin [-addPool [-owner ] [-group ] [-mode ] [-limit ] [-maxTtl ] + hdfs cacheadmin [-addPool [-owner ] [-group ] [-mode ] [-limit ] [-maxTtl ]] hdfs cacheadmin [-modifyPool [-owner ] [-group ] [-mode ] [-limit ] [-maxTtl ]] hdfs cacheadmin [-removePool ] hdfs cacheadmin [-listPools [-stats] []] --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org