Repository: hadoop
Updated Branches:
  refs/heads/branch-2 64bed0460 -> 5db04a5a1


HDFS-7172. Test data files may be checked out of git with incorrect line 
endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5db04a5a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5db04a5a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5db04a5a

Branch: refs/heads/branch-2
Commit: 5db04a5a1a27d4199bfcc1c31a001ff4db32810b
Parents: 64bed04
Author: Haohui Mai <[email protected]>
Authored: Wed Oct 1 10:45:54 2014 -0700
Committer: Haohui Mai <[email protected]>
Committed: Wed Oct 1 10:46:51 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/.gitattributes | 1 +
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt    | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5db04a5a/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/.gitattributes 
b/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
new file mode 100644
index 0000000..32bd020
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
@@ -0,0 +1 @@
+src/test/resources/data* text eol=lf

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5db04a5a/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 ff832ad..35ecc77 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -531,6 +531,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-6754. TestNamenodeCapacityReport may sometimes fail due to lack of
     retry. (Mit Desai via kihwal)
 
+    HDFS-7172. Test data files may be checked out of git with incorrect line
+    endings, causing test failures in TestHDFSCLI. (Chris Nauroth via wheat9)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an

Reply via email to