Repository: hadoop Updated Branches: refs/heads/branch-2 79204dced -> 61be28f50
MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth. (cherry picked from commit 684170d5efdc11bcd9967168f44a428d1a72af3c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/85a2b907 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/85a2b907 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/85a2b907 Branch: refs/heads/branch-2 Commit: 85a2b907407c7719a31c64d3747810263b3ec57d Parents: 79204dc Author: cnauroth <[email protected]> Authored: Thu Oct 9 22:25:17 2014 -0700 Committer: cnauroth <[email protected]> Committed: Thu Oct 9 22:27:40 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/85a2b907/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 81633f3..6813a1c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -195,6 +195,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/85a2b907/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/85a2b907/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 f77d896..321d64c 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>
