hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [44/50] [abbrv] git commit: MAPREDUCE-6122. Fix CHANGES.txt.
Date Fri, 10 Oct 2014 19:01:23 GMT
MAPREDUCE-6122. Fix CHANGES.txt.

(cherry picked from commit 2f0166db560b180e8d07c10ba9ad4bfaf2aa7b36)
(cherry picked from commit 61be28f501ba3de0915c165c9d43fa38463722c0)
(cherry picked from commit 4573bbe33d7016604787f1f4999fadc057da1b5e)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt


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

Branch: refs/heads/champlain
Commit: 75e42301491b8da2995f481a68899fd55a137d68
Parents: 45e6bd5
Author: cnauroth <cnauroth@apache.org>
Authored: Thu Oct 9 22:32:28 2014 -0700
Committer: cnauroth <cnauroth@apache.org>
Committed: Thu Oct 9 22:55:02 2014 -0700

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/75e42301/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index cbc71b2..a75d8a8 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -192,7 +192,7 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk
     (Akira AJISAKA via jlowe)
 
-    MAPREDUCE-6029. TestLineRecordReader may fail due to test data files checked
+    MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked
     out of git with incorrect line endings. (cnauroth)
 
 Release 2.5.1 - 2014-09-05


Mime
View raw message