From common-commits-return-17196-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org Sun Mar 4 19:38:33 2012 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 A53D09653 for ; Sun, 4 Mar 2012 19:38:33 +0000 (UTC) Received: (qmail 51337 invoked by uid 500); 4 Mar 2012 19:38:33 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 51286 invoked by uid 500); 4 Mar 2012 19:38:33 -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 51278 invoked by uid 99); 4 Mar 2012 19:38:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Mar 2012 19:38:33 +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; Sun, 04 Mar 2012 19:38:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 745892388865; Sun, 4 Mar 2012 19:38:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296862 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Date: Sun, 04 Mar 2012 19:38:10 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120304193810.745892388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: acmurthy Date: Sun Mar 4 19:38:09 2012 New Revision: 1296862 URL: http://svn.apache.org/viewvc?rev=1296862&view=rev Log: Merge -c 1296861 from trunk to branch-0.23 to fix HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project. Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1296862&r1=1296861&r2=1296862&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Sun Mar 4 19:38:09 2012 @@ -169,6 +169,9 @@ Release 0.23.2 - UNRELEASED HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir (Daryn Sharp via bobby) + HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the + project. (Jonathan Eagles via acmurthy) + Release 0.23.1 - 2012-02-17 INCOMPATIBLE CHANGES