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 3F7CDC0FF for ; Mon, 14 May 2012 18:19:32 +0000 (UTC) Received: (qmail 42772 invoked by uid 500); 14 May 2012 18:19:32 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 42648 invoked by uid 500); 14 May 2012 18:19:31 -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 42638 invoked by uid 99); 14 May 2012 18:19:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2012 18:19:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2012 18:19:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 384DA23888EA; Mon, 14 May 2012 18:19:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1338327 - in /hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common: ./ CHANGES.txt Date: Mon, 14 May 2012 18:19:10 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120514181910.384DA23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Mon May 14 18:19:09 2012 New Revision: 1338327 URL: http://svn.apache.org/viewvc?rev=1338327&view=rev Log: svn merge -c 1337415 from trunk for adding HADOOP-8113 to CHANGES.txt. Modified: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1337415 Modified: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1338327&r1=1338326&r2=1338327&view=diff ============================================================================== --- hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 14 18:19:09 2012 @@ -167,6 +167,9 @@ Release 2.0.0 - UNRELEASED HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop. (Roman Shaposhnik via atm) + HADOOP-8113. Correction to BUILDING.txt: HDFS needs ProtocolBuffer, too + (not just MapReduce). Contributed by Eugene Koontz. + OPTIMIZATIONS BUG FIXES Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1337415