update copyrights

2010-07-15 01:28:51 -04:00 · 2010-07-15 01:28:51 -04:00 · c88d1f033b
commit c88d1f033b
parent 46865fb454
105 changed files with 148 additions and 308 deletions
--- 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
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
 """
--- 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
--- 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
--- 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
--- 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.
--- 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
--- 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
+
--- 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
--- 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
--- 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
+   $ python node_worker.py --flagfile flagfile
--- 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
--- 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
--- 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
--- 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
--- 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
 =========================

--- 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
--- 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
--- 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).                                           
+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).                                           
--- 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
--- 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
--- 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
--- 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      
+   objectstore      
--- 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
--- 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:
--- 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 *
+from exception import *
--- 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
--- 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>
-"""
+"""
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
-"""
+"""
--- 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
--- 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
--- 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>
+</domain>
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
-"""
+"""
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
-"""
+"""
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
-"""
+"""
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
-"""
+"""
--- 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
--- 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
--- a/setup.py
+++ b/setup.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
--- a/Show More
+++ b/Show More