hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [1/3] git commit: HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.
Date Mon, 06 Oct 2014 16:19:26 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 e65d8b750 -> 08ccd3006


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

(cherry picked from commit 5db04a5a1a27d4199bfcc1c31a001ff4db32810b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt


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

Branch: refs/heads/branch-2.6
Commit: f567f3c8332fb3f7e23736041c6a0416fa541c8f
Parents: e65d8b7
Author: Haohui Mai <wheat9@apache.org>
Authored: Wed Oct 1 10:45:54 2014 -0700
Committer: cnauroth <cnauroth@apache.org>
Committed: Mon Oct 6 09:15:41 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/f567f3c8/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/f567f3c8/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 c4ac392..c0fcba7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -539,6 +539,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7176. The namenode usage message doesn't include "-rollingupgrade
     started" (cmccabe)
 
+    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


Mime
View raw message