diff options
| author | Todd Willey <todd@rubidine.com> | 2010-07-15 01:28:51 -0400 |
|---|---|---|
| committer | Todd Willey <todd@rubidine.com> | 2010-07-15 01:28:51 -0400 |
| commit | c88d1f033bd600e855c57d9a65d9d832b1b0ab85 (patch) | |
| tree | 4e19b948b89ce0f5d294ddb66c381834e0906886 | |
| parent | 46865fb45484794b14fe280be08529f023dcea3b (diff) | |
| download | nova-c88d1f033bd600e855c57d9a65d9d832b1b0ab85.tar.gz nova-c88d1f033bd600e855c57d9a65d9d832b1b0ab85.tar.xz nova-c88d1f033bd600e855c57d9a65d9d832b1b0ab85.zip | |
update copyrights
105 files changed, 148 insertions, 308 deletions
diff --git a/CA/geninter.sh b/CA/geninter.sh index 2aa64a842..6c0528d1b 100755 --- a/CA/geninter.sh +++ b/CA/geninter.sh @@ -1,19 +1,20 @@ #!/bin/bash -# Copyright [2010] [Anso Labs, 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 -# +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. - +# 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. # ARG is the id of the user export SUBJ=/C=US/ST=California/L=Mountain View/O=Anso Labs/OU=Nova Dev/CN=customer-intCA-$3 diff --git a/CA/genrootca.sh b/CA/genrootca.sh index e21f48d77..31976092e 100755 --- a/CA/genrootca.sh +++ b/CA/genrootca.sh @@ -1,18 +1,20 @@ #!/bin/bash -# Copyright [2010] [Anso Labs, LLC] +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. # -# 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 +# 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 +# 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. +# 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. if [ -f "cacert.pem" ]; then diff --git a/CA/openssl.cnf.tmpl b/CA/openssl.cnf.tmpl index b06f1cca0..639b8e80a 100644 --- a/CA/openssl.cnf.tmpl +++ b/CA/openssl.cnf.tmpl @@ -1,16 +1,18 @@ -# Copyright [2010] [Anso Labs, 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 -# +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. +# 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. # # OpenSSL configuration file. diff --git a/bin/dhcpleasor.py b/bin/dhcpleasor.py index 30f8fbdc3..31f4433fb 100755 --- a/bin/dhcpleasor.py +++ b/bin/dhcpleasor.py @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/bin/nova-api b/bin/nova-api index 1bef778c5..7bc9166b8 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/bin/nova-compute b/bin/nova-compute index 1b438f6a7..803887039 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore index 804b0e272..82daf61ce 100755 --- a/bin/nova-import-canonical-imagestore +++ b/bin/nova-import-canonical-imagestore @@ -1,6 +1,22 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. + """ Download images from Canonical Image Store """ diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor index 1f22b424e..d3f0ae221 100755 --- a/bin/nova-instancemonitor +++ b/bin/nova-instancemonitor @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/bin/nova-manage b/bin/nova-manage index 12e4c9324..5693a40f6 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/bin/nova-objectstore b/bin/nova-objectstore index f6d7b1270..7876864c0 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/bin/nova-rsapi b/bin/nova-rsapi index 24b469f75..c2f2c9d70 100755 --- a/bin/nova-rsapi +++ b/bin/nova-rsapi @@ -1,7 +1,9 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. # # 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/bin/nova-volume b/bin/nova-volume index 2720e12cd..9b7787c96 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/builddeb.sh b/builddeb.sh index 2fb20da2a..e354dc241 100755 --- a/builddeb.sh +++ b/builddeb.sh @@ -1,12 +1,9 @@ #!/bin/sh -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -20,3 +17,4 @@ # under the License. dpkg-buildpackage -b -rfakeroot -tc -uc -D + diff --git a/docs/architecture.rst b/docs/architecture.rst index 0000a02dd..11813d2c8 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/auth.rst b/docs/auth.rst index c906a481f..476ca9154 100644 --- a/docs/auth.rst +++ b/docs/auth.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/binaries.rst b/docs/binaries.rst index fa6127bb7..90a9581f7 100644 --- a/docs/binaries.rst +++ b/docs/binaries.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 @@ -30,4 +28,4 @@ The configuration of these binaries relies on "flagfiles" using the google gflags package. If present, the nova.conf file will be used as the flagfile - otherwise, it must be specified on the command line:: - $ python node_worker.py --flagfile flagfile
\ No newline at end of file + $ python node_worker.py --flagfile flagfile diff --git a/docs/compute.rst b/docs/compute.rst index 7b4f82a3b..5b08dbd5b 100644 --- a/docs/compute.rst +++ b/docs/compute.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/conf.py b/docs/conf.py index bc61f438c..784d8c096 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'nova' -copyright = u'2010, Anso Labs, LLC' +copyright = u'2010, United States Government as represented by the Administrator of the National Aeronautics and Space Administration.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/endpoint.rst b/docs/endpoint.rst index 830c99665..399df4161 100644 --- a/docs/endpoint.rst +++ b/docs/endpoint.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/fakes.rst b/docs/fakes.rst index 1454ca7b5..bea8bc4e9 100644 --- a/docs/fakes.rst +++ b/docs/fakes.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/getting.started.rst b/docs/getting.started.rst index 55a73dd00..3eadd0882 100644 --- a/docs/getting.started.rst +++ b/docs/getting.started.rst @@ -1,3 +1,20 @@ +.. + Copyright 2010 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. + + 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. + Getting Started with Nova ========================= diff --git a/docs/index.rst b/docs/index.rst index 9a5fa32ae..039bf00ff 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/modules.rst b/docs/modules.rst index 11e1eef7d..82c61f008 100644 --- a/docs/modules.rst +++ b/docs/modules.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/network.rst b/docs/network.rst index 2787ae458..357a0517f 100644 --- a/docs/network.rst +++ b/docs/network.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 @@ -87,4 +85,4 @@ Public Traffic:: The RoutingNode is currently implemented using IPTables rules, which implement both NATing of public IP addresses, and the appropriate firewall chains. We are also looking at using Netomata / Clusto to manage NATting within a switch or router, and/or to manage firewall rules within a hardware firewall appliance. -Similarly, the AddressingNode currently manages running DNSMasq instances for DHCP services. However, we could run an internal DHCP server (using Scapy ala Clusto), or even switch to static addressing by inserting the private address into the disk image the same way we insert the SSH keys. (See compute for more details).
\ No newline at end of file +Similarly, the AddressingNode currently manages running DNSMasq instances for DHCP services. However, we could run an internal DHCP server (using Scapy ala Clusto), or even switch to static addressing by inserting the private address into the disk image the same way we insert the SSH keys. (See compute for more details). diff --git a/docs/nova.rst b/docs/nova.rst index 01da34414..4b9c44a5f 100644 --- a/docs/nova.rst +++ b/docs/nova.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/objectstore.rst b/docs/objectstore.rst index 70048354a..6b8d293f4 100644 --- a/docs/objectstore.rst +++ b/docs/objectstore.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/packages.rst b/docs/packages.rst index fb28e850b..6029ad7d7 100644 --- a/docs/packages.rst +++ b/docs/packages.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/docs/storage.rst b/docs/storage.rst index f8c98b18d..f77e5f0e5 100644 --- a/docs/storage.rst +++ b/docs/storage.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 @@ -30,4 +28,4 @@ There are three primary classes of storage in a nova cloud environment: :maxdepth: 2 volume - objectstore
\ No newline at end of file + objectstore diff --git a/docs/volume.rst b/docs/volume.rst index 3981daf92..619968458 100644 --- a/docs/volume.rst +++ b/docs/volume.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, 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 diff --git a/exercise_rsapi.py b/exercise_rsapi.py index 4b9e65fc6..20589b9cb 100644 --- a/exercise_rsapi.py +++ b/exercise_rsapi.py @@ -1,3 +1,21 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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 cloudservers class IdFake: diff --git a/nova/__init__.py b/nova/__init__.py index 1c886716f..8745617bc 100644 --- a/nova/__init__.py +++ b/nova/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -33,4 +31,4 @@ .. moduleauthor:: Andy Smith <andy@anarkystic.com> """ -from exception import *
\ No newline at end of file +from exception import * diff --git a/nova/adminclient.py b/nova/adminclient.py index 3d239fb1d..1a5f41418 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/auth/__init__.py b/nova/auth/__init__.py index 0d115e9d9..e2a140e83 100644 --- a/nova/auth/__init__.py +++ b/nova/auth/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -27,4 +25,4 @@ .. moduleauthor:: Jesse Andrews <jesse@ansolabs.com> .. moduleauthor:: Vishvananda Ishaya <vishvananda@yahoo.com> .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> -"""
\ No newline at end of file +""" diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py index 116fcbb78..4c32ed9d9 100644 --- a/nova/auth/fakeldap.py +++ b/nova/auth/fakeldap.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template index b6d65297a..1b8ecb173 100644 --- a/nova/auth/novarc.template +++ b/nova/auth/novarc.template @@ -1,23 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2010 Anso Labs, 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. - NOVA_KEY_DIR=$(pushd $(dirname $BASH_SOURCE)>/dev/null; pwd; popd>/dev/null) export EC2_ACCESS_KEY="%(access)s:%(project)s" export EC2_SECRET_KEY="%(secret)s" diff --git a/nova/auth/rbac.py b/nova/auth/rbac.py index f4abd1075..9e2bb830c 100644 --- a/nova/auth/rbac.py +++ b/nova/auth/rbac.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/auth/signer.py b/nova/auth/signer.py index 4f7ac43bc..a3d3c5329 100644 --- a/nova/auth/signer.py +++ b/nova/auth/signer.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/auth/slap.sh b/nova/auth/slap.sh index 90dc7a9d6..fdc0e39dc 100755 --- a/nova/auth/slap.sh +++ b/nova/auth/slap.sh @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/auth/users.py b/nova/auth/users.py index 0ee2d4441..72edcc2aa 100644 --- a/nova/auth/users.py +++ b/nova/auth/users.py @@ -1,12 +1,9 @@ -#!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/cloudpipe/__init__.py b/nova/cloudpipe/__init__.py index 57ef14651..cfadc30e9 100644 --- a/nova/cloudpipe/__init__.py +++ b/nova/cloudpipe/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py index 610239c2e..99a0a1d6d 100644 --- a/nova/cloudpipe/api.py +++ b/nova/cloudpipe/api.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/cloudpipe/bootscript.sh b/nova/cloudpipe/bootscript.sh index 639aad66f..43fc2ecab 100755 --- a/nova/cloudpipe/bootscript.sh +++ b/nova/cloudpipe/bootscript.sh @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/cloudpipe/client.ovpn.template b/nova/cloudpipe/client.ovpn.template index a8ec5dc6e..e127eb9f0 100644 --- a/nova/cloudpipe/client.ovpn.template +++ b/nova/cloudpipe/client.ovpn.template @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 5f6ccf82e..de5326c5e 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py index 1c688c100..a5df2ec1a 100644 --- a/nova/compute/__init__.py +++ b/nova/compute/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -31,4 +29,4 @@ .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> -"""
\ No newline at end of file +""" diff --git a/nova/compute/disk.py b/nova/compute/disk.py index b6398f41e..b24a90d7f 100644 --- a/nova/compute/disk.py +++ b/nova/compute/disk.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/exception.py b/nova/compute/exception.py index b2bfc39e6..fefa7451d 100644 --- a/nova/compute/exception.py +++ b/nova/compute/exception.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/fakevirtinstance.xml b/nova/compute/fakevirtinstance.xml index 0df76f5ef..81640d0ae 100644 --- a/nova/compute/fakevirtinstance.xml +++ b/nova/compute/fakevirtinstance.xml @@ -1,22 +1,3 @@ -<!-- -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2010 Anso Labs, 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. ---> <domain type='kvm' id='100'> <name>i-A9B8C7D6</name> <uuid>12a345bc-67c8-901d-2e34-56f7g89012h3</uuid> @@ -44,4 +25,4 @@ <model type='e1000'/> </interface> </devices> -</domain>
\ No newline at end of file +</domain> diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template index 11dab7eb8..a763e8a4d 100644 --- a/nova/compute/libvirt.xml.template +++ b/nova/compute/libvirt.xml.template @@ -1,22 +1,3 @@ -<!-- -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2010 Anso Labs, 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. ---> <domain type='kvm'> <name>%(name)s</name> <os> diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py index c9e5bb1a7..358f184af 100644 --- a/nova/compute/linux_net.py +++ b/nova/compute/linux_net.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/model.py b/nova/compute/model.py index cc5f74b3d..f1eb99e74 100644 --- a/nova/compute/model.py +++ b/nova/compute/model.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py index c17cd0be4..b9fe20a71 100644 --- a/nova/compute/monitor.py +++ b/nova/compute/monitor.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/network.py b/nova/compute/network.py index e5d3d18df..8592d7af7 100644 --- a/nova/compute/network.py +++ b/nova/compute/network.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/compute/node.py b/nova/compute/node.py index f41bc34ea..7e4277f58 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/crypto.py b/nova/crypto.py index fc6ed714f..98d412687 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/datastore.py b/nova/datastore.py index da3e01c25..8d6272ada 100644 --- a/nova/datastore.py +++ b/nova/datastore.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/endpoint/__init__.py b/nova/endpoint/__init__.py index 00ebd398c..753685149 100644 --- a/nova/endpoint/__init__.py +++ b/nova/endpoint/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -31,4 +29,4 @@ .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> -"""
\ No newline at end of file +""" diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py index ceab7d1f9..b97a6727f 100644 --- a/nova/endpoint/admin.py +++ b/nova/endpoint/admin.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py index 86a4551ad..255519198 100755 --- a/nova/endpoint/api.py +++ b/nova/endpoint/api.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 32c7cbce0..5b713feb9 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py index 420b491f9..5c6514732 100644 --- a/nova/endpoint/images.py +++ b/nova/endpoint/images.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/endpoint/rackspace.py b/nova/endpoint/rackspace.py index ac32d20a4..29a077b24 100644 --- a/nova/endpoint/rackspace.py +++ b/nova/endpoint/rackspace.py @@ -1,17 +1,20 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] + +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. # -# 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 +# 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 +# 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. +# 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. """ Rackspace API diff --git a/nova/endpoint/wsgi.py b/nova/endpoint/wsgi.py index e0817fd0e..b7bb588c3 100644 --- a/nova/endpoint/wsgi.py +++ b/nova/endpoint/wsgi.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. ''' Utility methods for working with WSGI servers diff --git a/nova/exception.py b/nova/exception.py index ebd85a5a7..09d894e4b 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py index acb4d276c..00eb18327 100644 --- a/nova/fakerabbit.py +++ b/nova/fakerabbit.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/fakevirt.py b/nova/fakevirt.py index aec2fe0ca..bcbeae548 100644 --- a/nova/fakevirt.py +++ b/nova/fakevirt.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/flags.py b/nova/flags.py index 985f9ba04..22e00a44a 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/objectstore/__init__.py b/nova/objectstore/__init__.py index 25e9bf74a..b8890ac03 100644 --- a/nova/objectstore/__init__.py +++ b/nova/objectstore/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -31,4 +29,4 @@ .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> -"""
\ No newline at end of file +""" diff --git a/nova/objectstore/bucket.py b/nova/objectstore/bucket.py index a9dec5afb..61feb4a4c 100644 --- a/nova/objectstore/bucket.py +++ b/nova/objectstore/bucket.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py index 2482f6fea..22cfca5fd 100644 --- a/nova/objectstore/handler.py +++ b/nova/objectstore/handler.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, LLC -# # Copyright 2009 Facebook # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/objectstore/image.py b/nova/objectstore/image.py index 4de41ea96..bea2e9637 100644 --- a/nova/objectstore/image.py +++ b/nova/objectstore/image.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/objectstore/stored.py b/nova/objectstore/stored.py index fc656a040..f1730cbc7 100644 --- a/nova/objectstore/stored.py +++ b/nova/objectstore/stored.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/process.py b/nova/process.py index bc2d4474b..00ec4a267 100644 --- a/nova/process.py +++ b/nova/process.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/rpc.py b/nova/rpc.py index b0f6ef7f3..72a84b7f7 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/server.py b/nova/server.py index 49d5a1e89..1a6f33876 100644 --- a/nova/server.py +++ b/nova/server.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/test.py b/nova/test.py index fa05a02af..1f8a5ff47 100644 --- a/nova/test.py +++ b/nova/test.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index de4a3531a..aaf213923 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -30,4 +28,4 @@ .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> -"""
\ No newline at end of file +""" diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py index fc2c19227..609bda901 100644 --- a/nova/tests/access_unittest.py +++ b/nova/tests/access_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/api_integration.py b/nova/tests/api_integration.py index 0216b16ec..0ccf69525 100644 --- a/nova/tests/api_integration.py +++ b/nova/tests/api_integration.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py index d82089e6f..aee57b514 100644 --- a/nova/tests/api_unittest.py +++ b/nova/tests/api_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 992fc8c90..9df83ec62 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py index cbc0042da..d32f40d8f 100644 --- a/nova/tests/fake_flags.py +++ b/nova/tests/fake_flags.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py index af86f2788..be4218c39 100644 --- a/nova/tests/future_unittest.py +++ b/nova/tests/future_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/model_unittest.py b/nova/tests/model_unittest.py index 23e2f9e73..f70cab40d 100644 --- a/nova/tests/model_unittest.py +++ b/nova/tests/model_unittest.py @@ -1,17 +1,20 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] + +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. # -# 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 +# 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 +# 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. +# 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 logging import time diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index bccaacfa7..dd1966ffa 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py index 44c8d0421..4f7bbd587 100644 --- a/nova/tests/node_unittest.py +++ b/nova/tests/node_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index ddd455a73..7f85b8ee5 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py index 4e891fca7..671ab05cd 100644 --- a/nova/tests/process_unittest.py +++ b/nova/tests/process_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/real_flags.py b/nova/tests/real_flags.py index b30987f1e..9e106f227 100644 --- a/nova/tests/real_flags.py +++ b/nova/tests/real_flags.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py index e1377eeb8..b04602b71 100644 --- a/nova/tests/storage_unittest.py +++ b/nova/tests/storage_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py index a31ad4d7a..6110248b5 100644 --- a/nova/tests/users_unittest.py +++ b/nova/tests/users_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py index eea1beccb..38cddfef1 100644 --- a/nova/tests/validator_unittest.py +++ b/nova/tests/validator_unittest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/twistd.py b/nova/twistd.py index 44a19e9dc..03de2d0ab 100644 --- a/nova/twistd.py +++ b/nova/twistd.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/utils.py b/nova/utils.py index 2982b5480..25181332d 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/validate.py b/nova/validate.py index 820546b73..a69306fad 100644 --- a/nova/validate.py +++ b/nova/validate.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/vendor.py b/nova/vendor.py index 77bfe4be5..552f790ba 100644 --- a/nova/vendor.py +++ b/nova/vendor.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py index ad2181525..d6e944fc0 100644 --- a/nova/volume/__init__.py +++ b/nova/volume/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -30,4 +28,4 @@ .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> -"""
\ No newline at end of file +""" diff --git a/nova/volume/storage.py b/nova/volume/storage.py index e32944815..1507b4ec7 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/run_tests.py b/run_tests.py index d6f68f830..bd1587d43 100644 --- a/run_tests.py +++ b/run_tests.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/smoketests/__init__.py b/smoketests/__init__.py index ddd6919a0..dbc926f1e 100644 --- a/smoketests/__init__.py +++ b/smoketests/__init__.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 @@ -30,4 +28,4 @@ .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> -"""
\ No newline at end of file +""" diff --git a/smoketests/flags.py b/smoketests/flags.py index f239c5f40..ae0001e89 100644 --- a/smoketests/flags.py +++ b/smoketests/flags.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/smoketests/novatestcase.py b/smoketests/novatestcase.py index c19ef781b..11c8661ba 100644 --- a/smoketests/novatestcase.py +++ b/smoketests/novatestcase.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/smoketests/smoketest.py b/smoketests/smoketest.py index b752d814a..61967d3b7 100644 --- a/smoketests/smoketest.py +++ b/smoketests/smoketest.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 diff --git a/tools/clean-vlans b/tools/clean-vlans index c345de912..f5b0295ad 100755 --- a/tools/clean-vlans +++ b/tools/clean-vlans @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, 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 |