You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2014/10/10 07:27:21 UTC
git commit: MAPREDUCE-6122. TestLineRecordReader may fail due to test
data files checked out of git with incorrect line endings. Contributed by
Chris Nauroth.
Repository: hadoop
Updated Branches:
refs/heads/trunk 5b12df658 -> 684170d5e
MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. 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/684170d5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/684170d5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/684170d5
Branch: refs/heads/trunk
Commit: 684170d5efdc11bcd9967168f44a428d1a72af3c
Parents: 5b12df6
Author: cnauroth <cn...@apache.org>
Authored: Thu Oct 9 22:25:17 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Thu Oct 9 22:25:17 2014 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../hadoop-mapreduce-client-core/.gitattributes | 1 +
.../hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml | 1 +
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/684170d5/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 1adf7cf..c9c18df 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -414,6 +414,9 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-6029. TestCommitterEventHandler fails in trunk (Mit Desai via
jlowe)
+ MAPREDUCE-6029. TestLineRecordReader may fail due to test data files checked
+ out of git with incorrect line endings. (cnauroth)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/684170d5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
new file mode 100644
index 0000000..cbee8c4
--- /dev/null
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
@@ -0,0 +1 @@
+src/test/resources/*.txt text eol=lf
http://git-wip-us.apache.org/repos/asf/hadoop/blob/684170d5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
index 6e9d543..2a4a174 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
@@ -90,6 +90,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>.gitattributes</exclude>
<exclude>src/test/resources/recordSpanningMultipleSplits.txt</exclude>
<exclude>src/test/resources/testBOM.txt</exclude>
</excludes>