You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2017/05/24 17:04:38 UTC
[2/2] hadoop git commit: HADOOP-14449. The ASF Header in
ComparableVersion.java and SSLHostnameVerifier.java is not correct.
Contributed by ZhangBing Lin.
HADOOP-14449. The ASF Header in ComparableVersion.java and SSLHostnameVerifier.java is not correct. Contributed by ZhangBing Lin.
(cherry picked from commit b7a0c0e7019528fac492e1cb32d374ed014f8673)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e3a65b24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e3a65b24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e3a65b24
Branch: refs/heads/branch-2
Commit: e3a65b24bf3d60e67489397f86a42cf6bb6664a7
Parents: 96a97e7
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu May 25 01:03:22 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu May 25 01:04:06 2017 +0800
----------------------------------------------------------------------
.../security/ssl/SSLHostnameVerifier.java | 11 --------
.../apache/hadoop/util/ComparableVersion.java | 29 ++++++++++----------
2 files changed, 15 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3a65b24/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java
index 27e4920..47546b3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java
@@ -1,9 +1,4 @@
/*
- * $HeadURL$
- * $Revision$
- * $Date$
- *
- * ====================================================================
* 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
@@ -20,12 +15,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
*
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3a65b24/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java
index 9d34518..1f34291 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java
@@ -1,17 +1,3 @@
-// Code source of this file:
-// http://grepcode.com/file/repo1.maven.org/maven2/
-// org.apache.maven/maven-artifact/3.1.1/
-// org/apache/maven/artifact/versioning/ComparableVersion.java/
-//
-// Modifications made on top of the source:
-// 1. Changed
-// package org.apache.maven.artifact.versioning;
-// to
-// package org.apache.hadoop.util;
-// 2. Removed author tags to clear hadoop author tag warning
-//
-package org.apache.hadoop.util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,6 +17,21 @@ package org.apache.hadoop.util;
* under the License.
*/
+// Code source of this file:
+// http://grepcode.com/file/repo1.maven.org/maven2/
+// org.apache.maven/maven-artifact/3.1.1/
+// org/apache/maven/artifact/versioning/ComparableVersion.java/
+//
+// Modifications made on top of the source:
+// 1. Changed
+// package org.apache.maven.artifact.versioning;
+// to
+// package org.apache.hadoop.util;
+// 2. Removed author tags to clear hadoop author tag warning
+//
+package org.apache.hadoop.util;
+
+
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org