HDFS-5821. Merging r1573076 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573077 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 21:06:17 +00:00 · 2014-02-28 21:06:17 +00:00 · d333ea34aa
parent 70f101e536
commit d333ea34aa
2 changed files with 878 additions and 875 deletions
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@ -261,6 +261,9 @@ Release 2.4.0 - UNRELEASED
    HDFS-6033. PBImageXmlWriter incorrectly handles processing cache
    directives. (atm)

+    HDFS-5821. TestHDFSCLI fails for user names with the dash character.
+    (Gera Shegalov via Arpit Agarwal)
+
  BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS

    HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml