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 75A97200C73 for ; Wed, 10 May 2017 12:31:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6DA53160BB4; Wed, 10 May 2017 10:31:33 +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 B439F160BA8 for ; Wed, 10 May 2017 12:31:32 +0200 (CEST) Received: (qmail 37422 invoked by uid 500); 10 May 2017 10:31:30 -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 37413 invoked by uid 99); 10 May 2017 10:31:30 -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; Wed, 10 May 2017 10:31:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FA9ADFE61; Wed, 10 May 2017 10:31:30 +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: <412c18db925a4428a22c8846b7056c14@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14373. License error in org.apache.hadoop.metrics2.util.Servers. Contributed by hu xiaodong. Date: Wed, 10 May 2017 10:31:30 +0000 (UTC) archived-at: Wed, 10 May 2017 10:31:33 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8 59702efb7 -> 4f8dd60e4 HADOOP-14373. License error in org.apache.hadoop.metrics2.util.Servers. Contributed by hu xiaodong. (cherry picked from commit a5fa954684f517bdf0a50f3fa7a0314f24cc7049) (cherry picked from commit d9c3c78b7809d48e965046b2f76ac01e70942937) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4f8dd60e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4f8dd60e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4f8dd60e Branch: refs/heads/branch-2.8 Commit: 4f8dd60e4935ce0cc4cb554758498139c884ce01 Parents: 59702ef Author: Akira Ajisaka Authored: Wed May 10 05:29:47 2017 -0500 Committer: Akira Ajisaka Committed: Wed May 10 05:30:55 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/metrics2/util/Servers.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f8dd60e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java index aa5d715..19a64a9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java @@ -1,6 +1,4 @@ -/* - * Util.java - * +/** * 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