Repository: hadoop Updated Branches: refs/heads/branch-2 fd75b8c9c -> acc172e37
HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/acc172e3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/acc172e3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/acc172e3 Branch: refs/heads/branch-2 Commit: acc172e3718e23ff6808ddcc01543212f1334a27 Parents: fd75b8c Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Tue Feb 10 17:48:57 2015 -0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Tue Feb 10 17:50:00 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/src/test/resources/testHDFSConf.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/acc172e3/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 629b018..ca15e7a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -601,6 +601,9 @@ 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) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/acc172e3/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 93bbeb2..f1310fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml @@ -16281,8 +16281,8 @@ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes /user/USERNAME/dir1</command> <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data30bytes /user/USERNAME/dir1</command> - <command>-fs NAMENODE -getmerge /user/USERNAME/dir1 data</command> - <command>-cat data</command> + <command>-fs NAMENODE -getmerge /user/USERNAME/dir1 CLITEST_DATA/file</command> + <command>-cat CLITEST_DATA/file</command> </test-commands> <cleanup-commands> <command>-fs NAMENODE -rm -r /user/USERNAME</command>
