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 79EB617FC4 for ; Wed, 1 Oct 2014 16:06:00 +0000 (UTC) Received: (qmail 67293 invoked by uid 500); 1 Oct 2014 16:05:53 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 67179 invoked by uid 500); 1 Oct 2014 16:05:53 -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 67115 invoked by uid 99); 1 Oct 2014 16:05:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2014 16:05:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 57DF9925174; Wed, 1 Oct 2014 16:05:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Wed, 01 Oct 2014 16:06:07 -0000 Message-Id: In-Reply-To: <1980f4b9c7964b28bcc67ca02971f137@git.apache.org> References: <1980f4b9c7964b28bcc67ca02971f137@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] [abbrv] git commit: Merge branch 'trunk' into HDFS-6581 Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/222bf0fe Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/222bf0fe Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/222bf0fe Branch: refs/heads/trunk Commit: 222bf0fe6706ee43964fd39b8315c1a339fbc84a Parents: e4d29fd 25fd69a Author: arp Authored: Fri Sep 19 10:02:27 2014 -0700 Committer: arp Committed: Fri Sep 19 10:02:27 2014 -0700 ---------------------------------------------------------------------- .../hdfs/nfs/nfs3/TestRpcProgramNfs3.java | 3 ++- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 8 +++++++ .../datanode/fsdataset/impl/FsDatasetImpl.java | 16 +++++++++---- .../fsdataset/impl/TestWriteToReplica.java | 25 +++++++++++++++++++- 4 files changed, 46 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/222bf0fe/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/222bf0fe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java ----------------------------------------------------------------------