hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: HADOOP-14371. License error in TestLoadBalancingKMSClientProvider.java. Contributed by hu xiaodong.
Date Tue, 02 May 2017 14:42:00 GMT
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 <aajisaka@apache.org>
Authored: Tue May 2 23:36:54 2017 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
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


Mime
View raw message