Repository: hadoop Updated Branches: refs/heads/branch-2 0f9289e84 -> c52636df3
recommit "HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir." (cherry picked from commit acc172e3718e23ff6808ddcc01543212f1334a27) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c52636df Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c52636df Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c52636df Branch: refs/heads/branch-2 Commit: c52636df3f3b0a0aa47401269fbd9af811aee308 Parents: 0f9289e Author: Tsz-Wo Nicholas Sze <szets...@hortonworks.com> Authored: Tue Feb 10 17:48:57 2015 -0800 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Fri Feb 27 14:20:26 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/c52636df/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 e1e7dcd..9d5197d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -679,6 +679,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) + HDFS-7753. Fix Multithreaded correctness Warnings in BackupImage. (Rakesh R and shv) http://git-wip-us.apache.org/repos/asf/hadoop/blob/c52636df/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 c1cd5c8..7aac849 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml @@ -16293,8 +16293,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>