Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E7059171E1 for ; Fri, 10 Oct 2014 05:34:07 +0000 (UTC) Received: (qmail 6834 invoked by uid 500); 10 Oct 2014 05:34:07 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 6766 invoked by uid 500); 10 Oct 2014 05:34:07 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 6757 invoked by uid 99); 10 Oct 2014 05:34:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Oct 2014 05:34:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C908192F2; Fri, 10 Oct 2014 05:34:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cnauroth@apache.org To: common-commits@hadoop.apache.org Message-Id: <9e6ffa401c4542259c585849b971daa4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: MAPREDUCE-6122. Fix CHANGES.txt. Date: Fri, 10 Oct 2014 05:34:07 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.6 3fe4e0d3d -> 4573bbe33 MAPREDUCE-6122. Fix CHANGES.txt. (cherry picked from commit 2f0166db560b180e8d07c10ba9ad4bfaf2aa7b36) (cherry picked from commit 61be28f501ba3de0915c165c9d43fa38463722c0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4573bbe3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4573bbe3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4573bbe3 Branch: refs/heads/branch-2.6 Commit: 4573bbe33d7016604787f1f4999fadc057da1b5e Parents: 3fe4e0d Author: cnauroth Authored: Thu Oct 9 22:32:28 2014 -0700 Committer: cnauroth Committed: Thu Oct 9 22:33:54 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/4573bbe3/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index db59511..d5baf1d 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -183,7 +183,7 @@ 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 + 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