Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14374. License error in GridmixTestUtils.java. Contributed by lixinglong. 

(cherry picked from commit c60164fb60)
(cherry picked from commit 753954f7be)
This commit is contained in:
Akira Ajisaka 2017-05-09 05:37:13 -05:00
parent 0a149f3413
commit 0187892151
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -132,6 +132,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-14371. License error in TestLoadBalancingKMSClientProvider.java.
(hu xiaodong via aajisaka)
HADOOP-14374. License error in GridmixTestUtils.java.
(lixinglong via aajisaka)
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES

31
hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java
View File

@ -1,3 +1,19 @@
/**
* 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.hadoop.mapred.gridmix;
import org.apache.commons.logging.Log;
@ -15,20 +31,7 @@ import org.apache.hadoop.conf.Configuration;
import java.io.IOException;
/**
* 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
* <p/>
* http://www.apache.org/licenses/LICENSE-2.0
* <p/>
* 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.
* This is a test class.
*/
public class GridmixTestUtils {
private static final Log LOG = LogFactory.getLog(GridmixTestUtils.class);