Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C00D711409 for ; Tue, 24 Jun 2014 20:48:55 +0000 (UTC) Received: (qmail 24605 invoked by uid 500); 24 Jun 2014 20:48:54 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 24552 invoked by uid 500); 24 Jun 2014 20:48:54 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 24541 invoked by uid 99); 24 Jun 2014 20:48:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2014 20:48:54 +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, 24 Jun 2014 20:48:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 61DBB2388906; Tue, 24 Jun 2014 20:48:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1605184 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/webapps/hdfs/explorer.js Date: Tue, 24 Jun 2014 20:48:33 -0000 To: hdfs-commits@hadoop.apache.org From: wheat9@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140624204833.61DBB2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wheat9 Date: Tue Jun 24 20:48:32 2014 New Revision: 1605184 URL: http://svn.apache.org/r1605184 Log: HDFS-6587. Fix a typo in message issued from explorer.js. Contributed by Yongjun Zhang. Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1605184&r1=1605183&r2=1605184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Jun 24 20:48:32 2014 @@ -484,6 +484,7 @@ Release 2.5.0 - UNRELEASED NetworkTopology#sortByDistance. (Yongjun Zhang via wang) HDFS-6583. Remove clientNode in FileUnderConstructionFeature. (wheat9) + BUG FIXES HDFS-6112. NFS Gateway docs are incorrect for allowed hosts configuration. @@ -712,6 +713,9 @@ Release 2.5.0 - UNRELEASED HDFS-6587. Bug in TestBPOfferService can cause test failure. (Zhilei Xu via Arpit Agarwal) + HDFS-6598. Fix a typo in message issued from explorer.js. (Yongjun Zhang + via wheat9) + BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js?rev=1605184&r1=1605183&r2=1605184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js Tue Jun 24 20:48:32 2014 @@ -58,7 +58,7 @@ var msg = '

Path does not exist on HDFS or WebHDFS is disabled. Please check your path or enable WebHDFS

'; break; default: - var msg = '

Failed to retreive data from ' + url + ': ' + err + '

'; + var msg = '

Failed to retrieve data from ' + url + ': ' + err + '

'; } show_err_msg(msg); };