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 DDE9210C90 for ; Tue, 5 May 2015 15:40:08 +0000 (UTC) Received: (qmail 82500 invoked by uid 500); 5 May 2015 15:40:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 82435 invoked by uid 500); 5 May 2015 15:40:08 -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 82426 invoked by uid 99); 5 May 2015 15:40:08 -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, 05 May 2015 15:40:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B0ECE0FE2; Tue, 5 May 2015 15:40:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <7a481119f6124752a09541ce57c4ced2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet Houghland. Date: Tue, 5 May 2015 15:40:08 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 0f30913ea -> 84d8ba4f7 HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet Houghland. (cherry picked from commit 05adc76ace6bf28e4a3ff874044c2c41e3eba63f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84d8ba4f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84d8ba4f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84d8ba4f Branch: refs/heads/branch-2 Commit: 84d8ba4f722ce806391f3434268f08a96aae8741 Parents: 0f30913 Author: Andrew Wang Authored: Tue May 5 08:37:37 2015 -0700 Committer: Andrew Wang Committed: Tue May 5 08:37:41 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/fs/shell/Delete.java | 2 +- .../hadoop-common/src/test/resources/testConf.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/84d8ba4f/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index fd5bb4b..d885c41 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -70,6 +70,8 @@ Release 2.8.0 - UNRELEASED HADOOP-11328. ZKFailoverController does not log Exception when doRun raises errors. (Tianyin Xu via ozawa) + HADOOP-11120. hadoop fs -rmr gives wrong advice. (Juliet Hougland via wang) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/84d8ba4f/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java index 6798fbe..f882817 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java @@ -141,7 +141,7 @@ class Delete { @Override public String getReplacementCommand() { - return "rm -r"; + return "-rm -r"; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84d8ba4f/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml index 3729cf9..d36efd5 100644 --- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml +++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml @@ -429,7 +429,7 @@ RegexpComparator - ^\s*\(DEPRECATED\) Same as 'rm -r'\s* + ^\s*\(DEPRECATED\) Same as '-rm -r'\s*