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 C8F2517528 for ; Mon, 23 Mar 2015 20:15:00 +0000 (UTC) Received: (qmail 69944 invoked by uid 500); 23 Mar 2015 20:14:36 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 69290 invoked by uid 500); 23 Mar 2015 20:14:36 -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 66719 invoked by uid 99); 23 Mar 2015 20:14:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2015 20:14:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7AC61E184F; Mon, 23 Mar 2015 20:14:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: zhz@apache.org To: common-commits@hadoop.apache.org Date: Mon, 23 Mar 2015 20:14:53 -0000 Message-Id: <9571db7b1b474d8f83c919b7aaaf81e8@git.apache.org> In-Reply-To: <946cecad29da4ab7913daf4ffccc2163@git.apache.org> References: <946cecad29da4ab7913daf4ffccc2163@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B20/50=5D_=5Babbrv=5D_hadoop_git_commit=3A_HADOOP-1173?= =?utf-8?q?7=2E_mockito=27s_version_in_hadoop-nfs=E2=80=99_pom=2Exml_shouldn?= =?utf-8?q?=27t_be_specified=2E_Contributed_by_Kengo_Seki=2E?= HADOOP-11737. mockito's version in hadoop-nfs’ pom.xml shouldn't be specified. Contributed by Kengo Seki. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b9f12c8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b9f12c8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b9f12c8 Branch: refs/heads/HDFS-7285 Commit: 0b9f12c847e26103bc2304cf7114e6d103264669 Parents: b375d1f Author: Tsuyoshi Ozawa Authored: Mon Mar 23 13:56:24 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Mon Mar 23 13:56:24 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-nfs/pom.xml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b9f12c8/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4cd2154..430015d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -458,6 +458,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11447. Add a more meaningful toString method to SampleStat and MutableStat. (kasha) + HADOOP-11737. mockito's version in hadoop-nfs’ pom.xml shouldn't be + specified. (Kengo Seki via ozawa) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b9f12c8/hadoop-common-project/hadoop-nfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index 409ed75..e8156d9 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -55,7 +55,6 @@ org.mockito mockito-all - 1.8.5 commons-logging