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 E4E482009DC for ; Tue, 2 May 2017 16:42:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E377F160BA1; Tue, 2 May 2017 14:42:02 +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 35F8C160B9B for ; Tue, 2 May 2017 16:42:02 +0200 (CEST) Received: (qmail 32844 invoked by uid 500); 2 May 2017 14:42:01 -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 32835 invoked by uid 99); 2 May 2017 14:42:01 -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:42:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC9BFDFD43; Tue, 2 May 2017 14:42:00 +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: 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:42:00 +0000 (UTC) archived-at: Tue, 02 May 2017 14:42:03 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8.1 3c4722b34 -> 4e39090e4 HADOOP-14371. License error in TestLoadBalancingKMSClientProvider.java. Contributed by hu xiaodong. (cherry picked from commit 20cde552748cc6be1c5ca590755d4e5a67baf187) (cherry picked from commit 036624900be0bcc2af7f60a28a72cea0295f7300) (cherry picked from commit 42fa35d531e6c7e29620a8a88bcc0088dc012e67) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e39090e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e39090e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e39090e Branch: refs/heads/branch-2.8.1 Commit: 4e39090e453be7a0986a1a151f0eefe0467de803 Parents: 3c4722b Author: Akira Ajisaka Authored: Tue May 2 23:36:54 2017 +0900 Committer: Akira Ajisaka Committed: Tue May 2 23:39:38 2017 +0900 ---------------------------------------------------------------------- .../hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e39090e/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 9416b7a..48acf6c 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