Repository: hadoop Updated Branches: refs/heads/trunk 8f7d4bb09 -> 350b520c6
HDFS-7751. Fix TestHDFSCLI for quota with storage type. Contributed by Xiaoyu Yao Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/350b520c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/350b520c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/350b520c Branch: refs/heads/trunk Commit: 350b520c643ae86bdb9cbb65e4c312f00e2c6ed8 Parents: 8f7d4bb Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Sat Feb 7 15:40:47 2015 -0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Sat Feb 7 15:40:47 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 ++++- .../hadoop-hdfs/src/test/resources/testHDFSConf.xml | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/350b520c/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 7f1be78..8555862 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -20,7 +20,7 @@ Trunk (Unreleased) HDFS-3689. Add support for variable length block. (jing9) - HDFS-7584. Quota by Storage Type API, tools and ClientNameNode Protocol + HDFS-7720. Quota by Storage Type API, tools and ClientNameNode Protocol changes. (Xiaoyu Yao via Arpit Agarwal) IMPROVEMENTS @@ -284,6 +284,9 @@ Trunk (Unreleased) HDFS-7721. The HDFS BlockScanner may run fast during the first hour (cmccabe) + HDFS-7751. Fix TestHDFSCLI for quota with storage type. (Xiaoyu Yao + via szetszwo) + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/350b520c/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 c936115..6c71b6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml @@ -15550,10 +15550,6 @@ <type>RegexpComparator</type> <expected-output>^( |\t)*It does not fault if the directory has no quota.( )*</expected-output> </comparator> - <comparator> - <type>RegexpComparator</type> - <expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output> - </comparator> </comparators> </test> @@ -15620,6 +15616,10 @@ <type>RegexpComparator</type> <expected-output>^( |\t)*It does not fault if the directory has no quota.( )*</expected-output> </comparator> + <comparator> + <type>RegexpComparator</type> + <expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output> + </comparator> </comparators> </test>
