You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2015/02/11 20:15:44 UTC
[3/3] hadoop git commit: HDFS-7751. Fix TestHDFSCLI for quota with
storage type. Contributed by Xiaoyu Yao
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/b49eeddb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b49eeddb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b49eeddb
Branch: refs/heads/branch-2
Commit: b49eeddbafe624e860e623e1839fa1f9adcf4233
Parents: 8fa0fc9
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Sat Feb 7 15:40:47 2015 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Wed Feb 11 11:10:05 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop-hdfs/src/test/resources/testHDFSConf.xml | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b49eeddb/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 806662a..b6d4752 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -612,6 +612,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7753. Fix Multithreaded correctness Warnings in BackupImage.
(Rakesh R and shv)
+ HDFS-7751. Fix TestHDFSCLI for quota with storage type. (Xiaoyu Yao
+ via szetszwo)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b49eeddb/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 8695494..4e1d797 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
@@ -15508,10 +15508,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>
@@ -15578,6 +15574,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>