From 835f87bb0dd3c068896f52bfef98a88b16fa13a5 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Fri, 17 Jun 2016 14:52:53 +0530 Subject: Fix license discrepancies The repo had mixed references to both Apache BSD license and GPL licenses. This change removes references to Apache license. The license of this project is now same as that of GlusterFS. Change-Id: I39b72f59d14af304729560dd1d59fe307cd1ac1d Signed-off-by: Prashanth Pai --- test/__init__.py | 20 ++++++++------------ test/functional/libgfapi-python-tests.py | 17 ++++++++--------- test/unit/gluster/test_gfapi.py | 17 ++++++++--------- test/unit/gluster/test_utils.py | 18 +++++++----------- 4 files changed, 31 insertions(+), 41 deletions(-) (limited to 'test') diff --git a/test/__init__.py b/test/__init__.py index 821f5e3..b00eb23 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,17 +1,13 @@ -# Copyright (c) 2012-2014 Red Hat, Inc. +# Copyright (c) 2016 Red Hat, Inc. # -# Licensed 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. + import os import ConfigParser diff --git a/test/functional/libgfapi-python-tests.py b/test/functional/libgfapi-python-tests.py index 8c422e6..7dab995 100644 --- a/test/functional/libgfapi-python-tests.py +++ b/test/functional/libgfapi-python-tests.py @@ -1,13 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. -# This file is part of libgfapi-python project -# (http://review.gluster.org/#/q/project:libgfapi-python) -# which is a subproject of GlusterFS ( www.gluster.org) +# Copyright (c) 2016 Red Hat, Inc. # -# This file is licensed to you under your choice of the GNU Lesser -# General Public License, version 3 or any later version (LGPLv3 or -# later), or the GNU General Public License, version 2 (GPLv2), in all -# cases as published by the Free Software Foundation. - +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import unittest import os diff --git a/test/unit/gluster/test_gfapi.py b/test/unit/gluster/test_gfapi.py index 86fa621..a859c2f 100644 --- a/test/unit/gluster/test_gfapi.py +++ b/test/unit/gluster/test_gfapi.py @@ -1,13 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. -# This file is part of libgfapi-python project -# (http://review.gluster.org/#/q/project:libgfapi-python) -# which is a subproject of GlusterFS ( www.gluster.org) +# Copyright (c) 2016 Red Hat, Inc. # -# This file is licensed to you under your choice of the GNU Lesser -# General Public License, version 3 or any later version (LGPLv3 or -# later), or the GNU General Public License, version 2 (GPLv2), in all -# cases as published by the Free Software Foundation. - +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import unittest import gluster diff --git a/test/unit/gluster/test_utils.py b/test/unit/gluster/test_utils.py index eb7a15f..446bcd9 100644 --- a/test/unit/gluster/test_utils.py +++ b/test/unit/gluster/test_utils.py @@ -1,17 +1,13 @@ # Copyright (c) 2016 Red Hat, Inc. # -# Licensed 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. + import unittest from gluster import utils -- cgit