Repository: incubator-impala Updated Branches: refs/heads/branch-2.7.0 046267b72 -> fb646d1b0
IMPALA-4110: Add license to file that was deleted in master This file, written by the Impala community and licensed to the ASF, is no longer present in the master branch. Normally, all changes go to master, and then some changes are cherry-picked into branch-2.7.0. However, this change cannot go into master (since the file is now absent there) and must go into branch-2.7.0 (to make a RAT-clean release). Therefore, this change will only live in the 2.7.0 branch. Change-Id: Iff1a46cea8ca4147c1fff01628147843dd390d4a Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/fb646d1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/fb646d1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/fb646d1b Branch: refs/heads/branch-2.7.0 Commit: fb646d1b06a21f44518616bd49a91b88998ff602 Parents: 046267b Author: Jim Apple <jbap...@cloudera.com> Authored: Fri Sep 16 10:24:33 2016 -0700 Committer: Jim Apple <jbap...@cloudera.com> Committed: Fri Sep 16 10:24:33 2016 -0700 ---------------------------------------------------------------------- tests/comparison/conftest.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/fb646d1b/tests/comparison/conftest.py ---------------------------------------------------------------------- diff --git a/tests/comparison/conftest.py b/tests/comparison/conftest.py index 8126a84..a73ac86 100644 --- a/tests/comparison/conftest.py +++ b/tests/comparison/conftest.py @@ -1,3 +1,20 @@ +# 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. + import pytest import cli_options
