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 4159518986 for ; Wed, 16 Dec 2015 05:45:02 +0000 (UTC) Received: (qmail 10274 invoked by uid 500); 16 Dec 2015 05:44:57 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 10214 invoked by uid 500); 16 Dec 2015 05:44:57 -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 10205 invoked by uid 99); 16 Dec 2015 05:44:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2015 05:44:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEC32E08BE; Wed, 16 Dec 2015 05:44:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zxu@apache.org To: common-commits@hadoop.apache.org Message-Id: <7c627f1395d342739857d8ecf4dad787@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: Update CHANGES.txt to move MAPREDUCE-6436 from YARN to MAPREDUCE Date: Wed, 16 Dec 2015 05:44:56 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk ae67c8424 -> 7092d47fc Update CHANGES.txt to move MAPREDUCE-6436 from YARN to MAPREDUCE Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7092d47f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7092d47f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7092d47f Branch: refs/heads/trunk Commit: 7092d47fc0b3b792dd31f967c01d460dc089f60b Parents: ae67c84 Author: Zhihai Xu Authored: Tue Dec 15 21:43:19 2015 -0800 Committer: Zhihai Xu Committed: Tue Dec 15 21:43:19 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ hadoop-yarn-project/CHANGES.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7092d47f/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 37e20d3..499840b 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -680,6 +680,8 @@ Release 2.6.4 - UNRELEASED IMPROVEMENTS + MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7092d47f/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1a724e5..a8375ec 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -2030,8 +2030,6 @@ Release 2.6.4 - UNRELEASED IMPROVEMENTS - MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu) - OPTIMIZATIONS BUG FIXES