Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 79FA42009DC for ; Tue, 2 May 2017 16:41:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 78702160BA1; Tue, 2 May 2017 14:41:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BFFF8160B9B for ; Tue, 2 May 2017 16:41:34 +0200 (CEST) Received: (qmail 31556 invoked by uid 500); 2 May 2017 14:41:33 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 31546 invoked by uid 99); 2 May 2017 14:41:33 -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; Tue, 02 May 2017 14:41:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 620BDDFD43; Tue, 2 May 2017 14:41:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <7bf294c2d5f74620a255c19b3ae028af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14371. License error in TestLoadBalancingKMSClientProvider.java. Contributed by hu xiaodong. Date: Tue, 2 May 2017 14:41:33 +0000 (UTC) archived-at: Tue, 02 May 2017 14:41:35 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.7 130a0e215 -> 60e74edd0 HADOOP-14371. License error in TestLoadBalancingKMSClientProvider.java. Contributed by hu xiaodong. (cherry picked from commit 20cde552748cc6be1c5ca590755d4e5a67baf187) (cherry picked from commit 036624900be0bcc2af7f60a28a72cea0295f7300) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/60e74edd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60e74edd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60e74edd Branch: refs/heads/branch-2.7 Commit: 60e74edd05b49696ce78b88f07316ddd7316b522 Parents: 130a0e2 Author: Akira Ajisaka Authored: Tue May 2 23:36:54 2017 +0900 Committer: Akira Ajisaka Committed: Tue May 2 23:41:17 2017 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/60e74edd/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 04cd6cf..9157f85 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -129,6 +129,9 @@ Release 2.7.4 - UNRELEASED HADOOP-14211. FilterFs and ChRootedFs are too aggressive about enforcing "authorityNeeded". (Erik Krogen via wang) + HADOOP-14371. License error in TestLoadBalancingKMSClientProvider.java. + (hu xiaodong via aajisaka) + Release 2.7.3 - 2016-08-25 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/60e74edd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java index 08a3d93..6e17aeb 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java @@ -1,4 +1,4 @@ -/** when(p1.getKMSUrl()).thenReturn("p1"); +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org