diff --git a/hadoop-hdfs-project/hadoop-hdfs/.gitattributes b/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
new file mode 100644
index 00000000000..32bd0206e7e
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
@@ -0,0 +1 @@
+src/test/resources/data* text eol=lf
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ff832adc6db..35ecc77febb 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