Author: cnauroth
Date: Thu Sep 26 17:24:26 2013
New Revision: 1526611
URL: http://svn.apache.org/r1526611
Log:
HDFS-5258. Merging change r1526610 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1526611&r1=1526610&r2=1526611&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Sep 26 17:24:26 2013
@@ -107,6 +107,9 @@ Release 2.1.2 - UNRELEASED
HDFS-5251. Race between the initialization of NameNode and the http
server. (Haohui Mai via suresh)
+ HDFS-5258. Skip tests in TestHDFSCLI that are not applicable on Windows.
+ (Chuan Liu via cnauroth)
+
Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml?rev=1526611&r1=1526610&r2=1526611&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Thu Sep 26 17:24:26 2013
@@ -1043,6 +1043,7 @@
<test> <!-- TESTED -->
<description>ls: Negative test for quoted /*/* globbing </description>
+ <windows>false</windows>
<test-commands>
<command>-fs NAMENODE -mkdir /dir0</command>
<command>-fs NAMENODE -mkdir /dir0/dir1</command>
@@ -1062,6 +1063,7 @@
<test> <!-- TESTED -->
<description>ls: Test for quoted globbing </description>
+ <windows>false</windows>
<test-commands>
<command>-fs NAMENODE -mkdir /dir0</command>
<command>-fs NAMENODE -mkdir /dir0/\*</command>
@@ -1082,6 +1084,7 @@
<test> <!-- TESTED -->
<description>rm: Test for quoted globbing </description>
+ <windows>false</windows>
<test-commands>
<command>-fs NAMENODE -mkdir /dir0</command>
<command>-fs NAMENODE -mkdir /dir0/\*</command>
