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 E663AF2BA for ; Fri, 5 Apr 2013 20:49:57 +0000 (UTC) Received: (qmail 41289 invoked by uid 500); 5 Apr 2013 20:49:57 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 41234 invoked by uid 500); 5 Apr 2013 20:49: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 41225 invoked by uid 99); 5 Apr 2013 20:49:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Apr 2013 20:49:57 +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; Fri, 05 Apr 2013 20:49:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CF24823889E7 for ; Fri, 5 Apr 2013 20:49:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1465124 - /hadoop/common/branches/branch-2.0.4-alpha/ Date: Fri, 05 Apr 2013 20:49:34 -0000 To: common-commits@hadoop.apache.org From: cos@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130405204934.CF24823889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cos Date: Fri Apr 5 20:49:34 2013 New Revision: 1465124 URL: http://svn.apache.org/r1465124 Log: svn merge -c1465121 from trunk HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. Contributed by Jagane Sundar Modified: hadoop/common/branches/branch-2.0.4-alpha/ (props changed) Propchange: hadoop/common/branches/branch-2.0.4-alpha/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1465121