Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 c4c553321 -> 42fa35d53


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/42fa35d5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42fa35d5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42fa35d5

Branch: refs/heads/branch-2.8
Commit: 42fa35d531e6c7e29620a8a88bcc0088dc012e67
Parents: c4c5533
Author: Akira Ajisaka <[email protected]>
Authored: Tue May 2 23:36:54 2017 +0900
Committer: Akira Ajisaka <[email protected]>
Committed: Tue May 2 23:39:25 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/42fa35d5/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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to