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 a91f0416d6..827ecb3003 100644 --- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml +++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml @@ -320,7 +320,23 @@ RegexpComparator - ^\s*permission. Passing -f overwrites the destination if it already exists.( )* + ^( |\t)*permission. Passing -f overwrites the destination if it already exists. raw( )* + + + RegexpComparator + ^( |\t)*namespace extended attributes are preserved if \(1\) they are supported \(HDFS( )* + + + RegexpComparator + ^( |\t)*only\) and, \(2\) all of the source and target pathnames are in the \/\.reserved\/raw( )* + + + RegexpComparator + ^( |\t)*hierarchy. raw namespace xattr preservation is determined solely by the presence( )* + + + RegexpComparator + ^\s*\(or absence\) of the \/\.reserved\/raw prefix and not by the -p option.( )* diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt index 96ac01fda3..e37732606d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt @@ -95,3 +95,5 @@ fs-encryption (Unreleased) as boolean. (umamahesh) HDFS-6817. Fix findbugs and other warnings. (yliu) + + HDFS-6839. Fix TestCLI to expect new output. (clamb)