diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index ae83898e84a..ba553dc97b6 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) 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 2d3de1f99b2..e59b05a0d9a 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