From a71ab7b9b7c672ab3a41fc6d57532081490f9462 Mon Sep 17 00:00:00 2001 From: Chetan Risbud Date: Mon, 22 Jul 2013 18:11:52 +0530 Subject: Updating copyrights with current year Copyrights are updated across the code to reflect 2013. Copyrights message was added to couple of scripts. Change-Id: I2cfc7bdc6adaa5c9ab0075aab49021a5f0dea7a1 Signed-off-by: Chetan Risbud Reviewed-on: http://review.gluster.org/5371 Reviewed-by: Luis Pabon Tested-by: Luis Pabon --- extras/hook-scripts/S40ufo-stop.py | 16 ++++++++++++++++ gluster/swift/account/server.py | 2 +- gluster/swift/common/DiskDir.py | 2 +- gluster/swift/common/DiskFile.py | 2 +- gluster/swift/common/Glusterfs.py | 2 +- gluster/swift/common/constraints.py | 2 +- gluster/swift/common/exceptions.py | 2 +- gluster/swift/common/fs_utils.py | 2 +- gluster/swift/common/utils.py | 2 +- gluster/swift/container/server.py | 2 +- gluster/swift/obj/server.py | 2 +- gluster/swift/proxy/server.py | 2 +- test/functional/swift_test_client.py | 17 ++++++++++++++++- test/functional/tests.py | 17 ++++++++++++++++- test/functionalnosetests/swift_testing.py | 17 ++++++++++++++++- test/functionalnosetests/test_account.py | 18 +++++++++++++++++- test/functionalnosetests/test_container.py | 17 ++++++++++++++++- test/functionalnosetests/test_object.py | 17 ++++++++++++++++- test/unit/common/test_diskfile.py | 2 +- test/unit/common/test_fs_utils.py | 2 +- test/unit/common/test_utils.py | 2 +- test/unit/proxy/test_server.py | 17 ++++++++++++++++- tools/functional_tests.sh | 18 +++++++++++++++++- unittests.sh | 16 ++++++++++++++++ 24 files changed, 176 insertions(+), 22 deletions(-) diff --git a/extras/hook-scripts/S40ufo-stop.py b/extras/hook-scripts/S40ufo-stop.py index 107f196..d7d6756 100755 --- a/extras/hook-scripts/S40ufo-stop.py +++ b/extras/hook-scripts/S40ufo-stop.py @@ -1,5 +1,21 @@ #!/usr/bin/env python +# Copyright (c) 2013 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 +# +# 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 os from optparse import OptionParser diff --git a/gluster/swift/account/server.py b/gluster/swift/account/server.py index 3c6d616..ca718c3 100644 --- a/gluster/swift/account/server.py +++ b/gluster/swift/account/server.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/DiskDir.py b/gluster/swift/common/DiskDir.py index b4a8341..4c835d3 100644 --- a/gluster/swift/common/DiskDir.py +++ b/gluster/swift/common/DiskDir.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/DiskFile.py b/gluster/swift/common/DiskFile.py index 623248a..4b6602e 100644 --- a/gluster/swift/common/DiskFile.py +++ b/gluster/swift/common/DiskFile.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/Glusterfs.py b/gluster/swift/common/Glusterfs.py index d1b456a..01cfcc0 100644 --- a/gluster/swift/common/Glusterfs.py +++ b/gluster/swift/common/Glusterfs.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/constraints.py b/gluster/swift/common/constraints.py index 9a4d57e..523277d 100644 --- a/gluster/swift/common/constraints.py +++ b/gluster/swift/common/constraints.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/exceptions.py b/gluster/swift/common/exceptions.py index ec74353..010ea24 100644 --- a/gluster/swift/common/exceptions.py +++ b/gluster/swift/common/exceptions.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py index ea5c180..e624da1 100644 --- a/gluster/swift/common/fs_utils.py +++ b/gluster/swift/common/fs_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/common/utils.py b/gluster/swift/common/utils.py index 6503644..5152861 100644 --- a/gluster/swift/common/utils.py +++ b/gluster/swift/common/utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/container/server.py b/gluster/swift/container/server.py index 36632a6..780a300 100644 --- a/gluster/swift/container/server.py +++ b/gluster/swift/container/server.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/obj/server.py b/gluster/swift/obj/server.py index 084346a..e7b9ff3 100644 --- a/gluster/swift/obj/server.py +++ b/gluster/swift/obj/server.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/gluster/swift/proxy/server.py b/gluster/swift/proxy/server.py index d209186..512b9bb 100644 --- a/gluster/swift/proxy/server.py +++ b/gluster/swift/proxy/server.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py index a6d8aec..65a6824 100644 --- a/test/functional/swift_test_client.py +++ b/test/functional/swift_test_client.py @@ -1,4 +1,19 @@ -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. +# +# 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 +# +# 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. + +# Copyright (c) 2013 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. diff --git a/test/functional/tests.py b/test/functional/tests.py index da45cde..b16e829 100644 --- a/test/functional/tests.py +++ b/test/functional/tests.py @@ -1,5 +1,20 @@ #!/usr/bin/python -u -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. +# +# 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 +# +# 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. + +# Copyright (c) 2013 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. diff --git a/test/functionalnosetests/swift_testing.py b/test/functionalnosetests/swift_testing.py index 023a753..ef4005e 100644 --- a/test/functionalnosetests/swift_testing.py +++ b/test/functionalnosetests/swift_testing.py @@ -1,4 +1,19 @@ -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. +# +# 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 +# +# 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. + +# Copyright (c) 2013 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. diff --git a/test/functionalnosetests/test_account.py b/test/functionalnosetests/test_account.py index ae6e3c4..16e3dea 100755 --- a/test/functionalnosetests/test_account.py +++ b/test/functionalnosetests/test_account.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,22 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Copyright (c) 2013 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 +# +# 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 unittest from nose import SkipTest diff --git a/test/functionalnosetests/test_container.py b/test/functionalnosetests/test_container.py index e92a86c..75269c3 100755 --- a/test/functionalnosetests/test_container.py +++ b/test/functionalnosetests/test_container.py @@ -1,6 +1,21 @@ #!/usr/bin/python -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. +# +# 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 +# +# 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. + +# Copyright (c) 2013 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. diff --git a/test/functionalnosetests/test_object.py b/test/functionalnosetests/test_object.py index 168375d..9c7f9c5 100755 --- a/test/functionalnosetests/test_object.py +++ b/test/functionalnosetests/test_object.py @@ -1,6 +1,21 @@ #!/usr/bin/python -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. +# +# 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 +# +# 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. + +# Copyright (c) 2013 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. diff --git a/test/unit/common/test_diskfile.py b/test/unit/common/test_diskfile.py index 6367888..76a9d1a 100644 --- a/test/unit/common/test_diskfile.py +++ b/test/unit/common/test_diskfile.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/test/unit/common/test_fs_utils.py b/test/unit/common/test_fs_utils.py index 1828092..02c6ecb 100644 --- a/test/unit/common/test_fs_utils.py +++ b/test/unit/common/test_fs_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py index 6622f45..6d6319d 100644 --- a/test/unit/common/test_utils.py +++ b/test/unit/common/test_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Red Hat, Inc. +# Copyright (c) 2012-2013 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. diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index 3bb2c02..638e6b4 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -1,4 +1,19 @@ -# Copyright (c) 2010-2012 OpenStack, LLC. +# Copyright (c) 2010-2013 OpenStack, LLC. +# +# 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 +# +# 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. + +# Copyright (c) 2013 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. diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh index 4b79bf6..f31647d 100644 --- a/tools/functional_tests.sh +++ b/tools/functional_tests.sh @@ -1,11 +1,27 @@ #!/bin/bash +# Copyright (c) 2013 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 +# +# 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. + + cleanup() { sudo service memcached stop sudo swift-init main stop sudo yum -y remove glusterfs-openstack-swift - sudo rm -rf /etc/swift > /dev/null 2>&1 + sudo rm -rf /etc/swift > /dev/null 2>&1 } quit() diff --git a/unittests.sh b/unittests.sh index 4873c45..940ada7 100755 --- a/unittests.sh +++ b/unittests.sh @@ -1,5 +1,21 @@ #!/bin/bash +# Copyright (c) 2013 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 +# +# 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. + + cd $(dirname $0)/test/unit nosetests -v --exe --with-coverage --cover-package gluster --cover-erase --cover-html --cover-branches $@ -- cgit