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 EEBFF10996 for ; Tue, 28 Jan 2014 07:34:29 +0000 (UTC) Received: (qmail 65451 invoked by uid 500); 28 Jan 2014 07:34:28 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 65409 invoked by uid 500); 28 Jan 2014 07:34:27 -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 65402 invoked by uid 99); 28 Jan 2014 07:34:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jan 2014 07:34:27 +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; Tue, 28 Jan 2014 07:34:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1CBB923889DA; Tue, 28 Jan 2014 07:34:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1561961 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Date: Tue, 28 Jan 2014 07:34:04 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140128073404.1CBB923889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: suresh Date: Tue Jan 28 07:34:03 2014 New Revision: 1561961 URL: http://svn.apache.org/r1561961 Log: HADOOP-10255. Adding missed CHANGES.txt from change 1561959. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561961&r1=1561960&r2=1561961&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 28 07:34:03 2014 @@ -661,8 +661,8 @@ Release 2.3.0 - UNRELEASED HADOOP-9830. Fix typo at http://hadoop.apache.org/docs/current/ (Kousuke Saruta via Arpit Agarwal) - HADOOP-10255. Rename HttpServer into HttpServer2. - (Haohui Mai via suresh) + HADOOP-10255. Rename HttpServer to HttpServer2 to retain older + HttpServer in branch-2 for compatibility. (Haohui Mai via suresh) Release 2.2.0 - 2013-10-13