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 9A0BC9138 for ; Wed, 22 Feb 2012 14:53:44 +0000 (UTC) Received: (qmail 64512 invoked by uid 500); 22 Feb 2012 14:53:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 64259 invoked by uid 500); 22 Feb 2012 14:53:43 -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 64248 invoked by uid 99); 22 Feb 2012 14:53:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 14:53:43 +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; Wed, 22 Feb 2012 14:53:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8C1A823888E4 for ; Wed, 22 Feb 2012 14:53:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1292326 - /hadoop/common/branches/HDFS-1623/ Date: Wed, 22 Feb 2012 14:53:22 -0000 To: common-commits@hadoop.apache.org From: atm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120222145322.8C1A823888E4@eris.apache.org> Author: atm Date: Wed Feb 22 14:53:21 2012 New Revision: 1292326 URL: http://svn.apache.org/viewvc?rev=1292326&view=rev Log: Merge trunk into HA branch. Modified: hadoop/common/branches/HDFS-1623/ (props changed) Propchange: hadoop/common/branches/HDFS-1623/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 22 14:53:21 2012 @@ -1 +1 @@ -/hadoop/common/trunk:1152502-1291890 +/hadoop/common/trunk:1152502-1292323