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 <[email protected]> Authored: Tue May 2 23:36:54 2017 +0900 Committer: Akira Ajisaka <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
