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 ji...@apache.org on 2015/02/09 00:34:16 UTC

[4/9] 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/2fef7155
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2fef7155
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2fef7155

Branch: refs/heads/HDFS-EC
Commit: 2fef7155a2eab0791ad9c9e9539a95f02480a82e
Parents: d0b53b4
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Sat Feb 7 15:40:47 2015 -0800
Committer: Jing Zhao <ji...@apache.org>
Committed: Sun Feb 8 15:25: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/2fef7155/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/2fef7155/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>