Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2C3A178DB for ; Fri, 31 Oct 2014 06:48:38 +0000 (UTC) Received: (qmail 16490 invoked by uid 500); 31 Oct 2014 06:48:38 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 16392 invoked by uid 500); 31 Oct 2014 06:48:38 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 16376 invoked by uid 99); 31 Oct 2014 06:48:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 06:48:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9345CA073CA; Fri, 31 Oct 2014 06:48:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rbalamohan@apache.org To: commits@tez.apache.org Date: Fri, 31 Oct 2014 06:48:39 -0000 Message-Id: <80495d7f49bd47f9b5dfb3d04d653815@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: TEZ-1698. addendum - fix license template issue. (Rajesh Balamohan) (Cherry picked from commit 81322efc2b8b843008cb3bebe8e5db78af20eb58) TEZ-1698. addendum - fix license template issue. (Rajesh Balamohan) (Cherry picked from commit 81322efc2b8b843008cb3bebe8e5db78af20eb58) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/2a9a1055 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/2a9a1055 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/2a9a1055 Branch: refs/heads/branch-0.5 Commit: 2a9a10555036ff7a068770a8ab588acdd248680c Parents: 536ba5e Author: Rajesh Balamohan Authored: Fri Oct 31 12:17:31 2014 +0530 Committer: Rajesh Balamohan Committed: Fri Oct 31 12:18:01 2014 +0530 ---------------------------------------------------------------------- .../tez/util/TezMxBeanResourceCalculator.java | 22 ++++++------ .../util/TestTezMxBeanResourceCalculator.java | 36 ++++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/2a9a1055/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java b/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java index e8aeb0b..330a2fd 100644 --- a/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java +++ b/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java @@ -1,11 +1,3 @@ -package org.apache.tez.util; - -import org.apache.hadoop.yarn.util.ResourceCalculatorProcessTree; - -import java.lang.management.ManagementFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; - /** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -14,9 +6,9 @@ import java.util.concurrent.atomic.AtomicLong; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,6 +16,14 @@ import java.util.concurrent.atomic.AtomicLong; * limitations under the License. */ +package org.apache.tez.util; + +import org.apache.hadoop.yarn.util.ResourceCalculatorProcessTree; + +import java.lang.management.ManagementFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + /** * Uses sun's MBeans to return process information. */ http://git-wip-us.apache.org/repos/asf/tez/blob/2a9a1055/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java b/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java index ade2118..fdc0cb7 100644 --- a/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java +++ b/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java @@ -1,3 +1,21 @@ +/** + * 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 + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.tez.util; import org.apache.hadoop.conf.Configuration; @@ -21,24 +39,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * 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 - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - public class TestTezMxBeanResourceCalculator { private ResourceCalculatorProcessTree resourceCalculator;