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 2B1801076F for ; Fri, 27 Feb 2015 10:26:13 +0000 (UTC) Received: (qmail 36295 invoked by uid 500); 27 Feb 2015 10:26:13 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 36230 invoked by uid 500); 27 Feb 2015 10:26:12 -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 36221 invoked by uid 99); 27 Feb 2015 10:26:12 -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; Fri, 27 Feb 2015 10:26:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C81B2E052F; Fri, 27 Feb 2015 10:26:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: szetszwo@apache.org To: common-commits@hadoop.apache.org Message-Id: <5dc44c23610f4c56b590e8738d529c24@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: Revert "HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir." Date: Fri, 27 Feb 2015 10:26:12 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 48c7ee755 -> 2954e6546 Revert "HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir." This reverts commit 7c6b6547eeed110e1a842e503bfd33afe04fa814. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2954e654 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2954e654 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2954e654 Branch: refs/heads/trunk Commit: 2954e654677bd1807d22fae7becc4464d9eff00b Parents: 48c7ee7 Author: Tsz-Wo Nicholas Sze Authored: Fri Feb 27 18:25:32 2015 +0800 Committer: Tsz-Wo Nicholas Sze Committed: Fri Feb 27 18:25:32 2015 +0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 --- .../hadoop-hdfs/src/test/resources/testHDFSConf.xml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2954e654/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 ae83898..ba553dc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -975,9 +975,6 @@ Release 2.7.0 - UNRELEASED HDFS-7714. Simultaneous restart of HA NameNodes and DataNode can cause DataNode to register successfully with only one NameNode.(vinayakumarb) - HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir. - (szetszwo) - HDFS-7753. Fix Multithreaded correctness Warnings in BackupImage. (Rakesh R and shv) http://git-wip-us.apache.org/repos/asf/hadoop/blob/2954e654/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml index 2d3de1f..e59b05a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml @@ -16483,8 +16483,8 @@ -fs NAMENODE -mkdir -p /user/USERNAME/dir1 -fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes /user/USERNAME/dir1 -fs NAMENODE -copyFromLocal CLITEST_DATA/data30bytes /user/USERNAME/dir1 - -fs NAMENODE -getmerge /user/USERNAME/dir1 CLITEST_DATA/file - -cat CLITEST_DATA/file + -fs NAMENODE -getmerge /user/USERNAME/dir1 data + -cat data -fs NAMENODE -rm -r /user/USERNAME