summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/nova-api2
-rwxr-xr-xbin/nova-compute2
-rwxr-xr-xbin/nova-instancemonitor2
-rwxr-xr-xbin/nova-manage2
-rwxr-xr-xbin/nova-objectstore2
-rwxr-xr-xbin/nova-volume2
-rwxr-xr-xbuilddeb.sh2
-rw-r--r--nova/__init__.py2
-rw-r--r--nova/adminclient.py2
-rw-r--r--nova/auth/__init__.py2
-rw-r--r--nova/auth/fakeldap.py2
-rw-r--r--nova/auth/novarc.template2
-rw-r--r--nova/auth/rbac.py2
-rw-r--r--nova/auth/signer.py2
-rwxr-xr-xnova/auth/slap.sh2
-rw-r--r--nova/auth/users.py2
-rw-r--r--nova/cloudpipe/__init__.py2
-rw-r--r--nova/cloudpipe/api.py2
-rwxr-xr-xnova/cloudpipe/bootscript.sh2
-rw-r--r--nova/cloudpipe/client.ovpn.template2
-rw-r--r--nova/cloudpipe/pipelib.py2
-rw-r--r--nova/compute/__init__.py2
-rw-r--r--nova/compute/disk.py2
-rw-r--r--nova/compute/exception.py2
-rw-r--r--nova/compute/fakevirtinstance.xml2
-rw-r--r--nova/compute/libvirt.xml.template2
-rw-r--r--nova/compute/linux_net.py2
-rw-r--r--nova/compute/model.py2
-rw-r--r--nova/compute/monitor.py2
-rw-r--r--nova/compute/network.py2
-rw-r--r--nova/compute/node.py2
-rw-r--r--nova/crypto.py2
-rw-r--r--nova/datastore.py2
-rw-r--r--nova/endpoint/__init__.py2
-rw-r--r--nova/endpoint/admin.py2
-rwxr-xr-xnova/endpoint/api.py2
-rw-r--r--nova/endpoint/cloud.py2
-rw-r--r--nova/endpoint/images.py2
-rw-r--r--nova/exception.py2
-rw-r--r--nova/fakerabbit.py2
-rw-r--r--nova/fakevirt.py2
-rw-r--r--nova/flags.py2
-rw-r--r--nova/objectstore/__init__.py2
-rw-r--r--nova/objectstore/bucket.py2
-rw-r--r--nova/objectstore/handler.py2
-rw-r--r--nova/objectstore/image.py2
-rw-r--r--nova/objectstore/stored.py2
-rw-r--r--nova/process.py2
-rw-r--r--nova/rpc.py2
-rw-r--r--nova/server.py2
-rw-r--r--nova/test.py2
-rw-r--r--nova/tests/__init__.py2
-rw-r--r--nova/tests/access_unittest.py2
-rw-r--r--nova/tests/api_integration.py2
-rw-r--r--nova/tests/api_unittest.py2
-rw-r--r--nova/tests/cloud_unittest.py2
-rw-r--r--nova/tests/datastore_unittest.py2
-rw-r--r--nova/tests/fake_flags.py2
-rw-r--r--nova/tests/future_unittest.py2
-rw-r--r--nova/tests/keeper_unittest.py2
-rw-r--r--nova/tests/network_unittest.py2
-rw-r--r--nova/tests/node_unittest.py2
-rw-r--r--nova/tests/objectstore_unittest.py2
-rw-r--r--nova/tests/process_unittest.py2
-rw-r--r--nova/tests/real_flags.py2
-rw-r--r--nova/tests/storage_unittest.py2
-rw-r--r--nova/tests/users_unittest.py2
-rw-r--r--nova/tests/validator_unittest.py2
-rw-r--r--nova/twistd.py2
-rw-r--r--nova/utils.py2
-rw-r--r--nova/validate.py2
-rw-r--r--nova/vendor.py2
-rw-r--r--nova/volume/__init__.py2
-rw-r--r--nova/volume/storage.py2
-rw-r--r--run_tests.py2
-rw-r--r--setup.py2
-rw-r--r--smoketests/__init__.py2
-rw-r--r--smoketests/flags.py2
-rw-r--r--smoketests/novatestcase.py2
-rw-r--r--smoketests/smoketest.py2
-rwxr-xr-xtools/clean-vlans2
81 files changed, 81 insertions, 81 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 5ea49692c..e9772ec81 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-compute b/bin/nova-compute
index b1a6354b8..cc738e87f 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index d21732a15..1f22b424e 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-manage b/bin/nova-manage
index c9f36ad32..f418e162b 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 26dcd2676..f6d7b1270 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-volume b/bin/nova-volume
index f3f8cb9a4..2720e12cd 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/builddeb.sh b/builddeb.sh
index 5055dd332..2fb20da2a 100755
--- a/builddeb.sh
+++ b/builddeb.sh
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/__init__.py b/nova/__init__.py
index 1151ee639..1c886716f 100644
--- a/nova/__init__.py
+++ b/nova/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/adminclient.py b/nova/adminclient.py
index ef1ee03c0..fe873b8f7 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/__init__.py b/nova/auth/__init__.py
index bfc5ef4d5..0d115e9d9 100644
--- a/nova/auth/__init__.py
+++ b/nova/auth/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py
index 13b2435dd..27dde314d 100644
--- a/nova/auth/fakeldap.py
+++ b/nova/auth/fakeldap.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index 91a3c68c8..b6d65297a 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/rbac.py b/nova/auth/rbac.py
index eb85a3de1..f4abd1075 100644
--- a/nova/auth/rbac.py
+++ b/nova/auth/rbac.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/signer.py b/nova/auth/signer.py
index 526a54262..4f7ac43bc 100644
--- a/nova/auth/signer.py
+++ b/nova/auth/signer.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/slap.sh b/nova/auth/slap.sh
index ac2af422f..277ae2bcd 100755
--- a/nova/auth/slap.sh
+++ b/nova/auth/slap.sh
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/users.py b/nova/auth/users.py
index 72c3c8466..6997596aa 100644
--- a/nova/auth/users.py
+++ b/nova/auth/users.py
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/__init__.py b/nova/cloudpipe/__init__.py
index 5c35d696c..57ef14651 100644
--- a/nova/cloudpipe/__init__.py
+++ b/nova/cloudpipe/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py
index 87283ef07..610239c2e 100644
--- a/nova/cloudpipe/api.py
+++ b/nova/cloudpipe/api.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/bootscript.sh b/nova/cloudpipe/bootscript.sh
index 312258c22..639aad66f 100755
--- a/nova/cloudpipe/bootscript.sh
+++ b/nova/cloudpipe/bootscript.sh
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/client.ovpn.template b/nova/cloudpipe/client.ovpn.template
index 80b5dab26..a8ec5dc6e 100644
--- a/nova/cloudpipe/client.ovpn.template
+++ b/nova/cloudpipe/client.ovpn.template
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 106a31368..09da71c64 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py
index fe8d357a3..1c688c100 100644
--- a/nova/compute/__init__.py
+++ b/nova/compute/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/disk.py b/nova/compute/disk.py
index 84329ae55..e7090dad3 100644
--- a/nova/compute/disk.py
+++ b/nova/compute/disk.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/exception.py b/nova/compute/exception.py
index 829810bb0..b2bfc39e6 100644
--- a/nova/compute/exception.py
+++ b/nova/compute/exception.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/fakevirtinstance.xml b/nova/compute/fakevirtinstance.xml
index 88cc623a8..0df76f5ef 100644
--- a/nova/compute/fakevirtinstance.xml
+++ b/nova/compute/fakevirtinstance.xml
@@ -1,6 +1,6 @@
<!--
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template
index 9f40365a3..11dab7eb8 100644
--- a/nova/compute/libvirt.xml.template
+++ b/nova/compute/libvirt.xml.template
@@ -1,6 +1,6 @@
<!--
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py
index 2ec1fe183..14d7a1275 100644
--- a/nova/compute/linux_net.py
+++ b/nova/compute/linux_net.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/model.py b/nova/compute/model.py
index cd5ab4047..86f912f01 100644
--- a/nova/compute/model.py
+++ b/nova/compute/model.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py
index 2d6911a89..c17cd0be4 100644
--- a/nova/compute/monitor.py
+++ b/nova/compute/monitor.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/network.py b/nova/compute/network.py
index dc2ff7760..911d0344a 100644
--- a/nova/compute/network.py
+++ b/nova/compute/network.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/node.py b/nova/compute/node.py
index 1dd1621b0..c217056f5 100644
--- a/nova/compute/node.py
+++ b/nova/compute/node.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/crypto.py b/nova/crypto.py
index 1afe9a025..80b4ef9de 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/datastore.py b/nova/datastore.py
index 82a507468..6b8a01ca5 100644
--- a/nova/datastore.py
+++ b/nova/datastore.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/__init__.py b/nova/endpoint/__init__.py
index 4f98051a8..00ebd398c 100644
--- a/nova/endpoint/__init__.py
+++ b/nova/endpoint/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py
index d88882039..ccc0472af 100644
--- a/nova/endpoint/admin.py
+++ b/nova/endpoint/admin.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py
index 8cd10b954..ece487b7b 100755
--- a/nova/endpoint/api.py
+++ b/nova/endpoint/api.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 2b4795982..39b3fd628 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py
index ba1c101c3..420b491f9 100644
--- a/nova/endpoint/images.py
+++ b/nova/endpoint/images.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/exception.py b/nova/exception.py
index 88fac4471..ebd85a5a7 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py
index b2852bc50..acb4d276c 100644
--- a/nova/fakerabbit.py
+++ b/nova/fakerabbit.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/fakevirt.py b/nova/fakevirt.py
index 726df3024..aec2fe0ca 100644
--- a/nova/fakevirt.py
+++ b/nova/fakevirt.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/flags.py b/nova/flags.py
index 1ed0785fb..bf7b6e3a3 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/__init__.py b/nova/objectstore/__init__.py
index b4aa6f928..25e9bf74a 100644
--- a/nova/objectstore/__init__.py
+++ b/nova/objectstore/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/bucket.py b/nova/objectstore/bucket.py
index fc8c1a0f3..a9dec5afb 100644
--- a/nova/objectstore/bucket.py
+++ b/nova/objectstore/bucket.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py
index cb062d146..462ad90b1 100644
--- a/nova/objectstore/handler.py
+++ b/nova/objectstore/handler.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/image.py b/nova/objectstore/image.py
index 9cbe54a1a..dc4667ec2 100644
--- a/nova/objectstore/image.py
+++ b/nova/objectstore/image.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/stored.py b/nova/objectstore/stored.py
index 4c6ea649b..fc656a040 100644
--- a/nova/objectstore/stored.py
+++ b/nova/objectstore/stored.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/process.py b/nova/process.py
index 4792b26e7..bc2d4474b 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/rpc.py b/nova/rpc.py
index c7347156e..54843973a 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/server.py b/nova/server.py
index 376dbb1da..49d5a1e89 100644
--- a/nova/server.py
+++ b/nova/server.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/test.py b/nova/test.py
index 4dd3775ef..c226b43e7 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 3c24deeb3..de4a3531a 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py
index 5b5bc7834..fc2c19227 100644
--- a/nova/tests/access_unittest.py
+++ b/nova/tests/access_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/api_integration.py b/nova/tests/api_integration.py
index 02aec7120..0216b16ec 100644
--- a/nova/tests/api_integration.py
+++ b/nova/tests/api_integration.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py
index d6a1d09de..a796ab41e 100644
--- a/nova/tests/api_unittest.py
+++ b/nova/tests/api_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 0a518de7a..992fc8c90 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/datastore_unittest.py b/nova/tests/datastore_unittest.py
index 78ea56f24..f4165a257 100644
--- a/nova/tests/datastore_unittest.py
+++ b/nova/tests/datastore_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 5614f6af8..d40172cfc 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py
index 4a46d8506..af86f2788 100644
--- a/nova/tests/future_unittest.py
+++ b/nova/tests/future_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/keeper_unittest.py b/nova/tests/keeper_unittest.py
index f53b1fe56..0a993afd7 100644
--- a/nova/tests/keeper_unittest.py
+++ b/nova/tests/keeper_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py
index 410fdf7a2..f215c0b3f 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py
index 91927c35a..44c8d0421 100644
--- a/nova/tests/node_unittest.py
+++ b/nova/tests/node_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index 1f468dcfe..89c1d59c5 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py
index 24fad4d1d..4e891fca7 100644
--- a/nova/tests/process_unittest.py
+++ b/nova/tests/process_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/real_flags.py b/nova/tests/real_flags.py
index c7ab10d6f..b30987f1e 100644
--- a/nova/tests/real_flags.py
+++ b/nova/tests/real_flags.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py
index 593ac16f1..73215c5ca 100644
--- a/nova/tests/storage_unittest.py
+++ b/nova/tests/storage_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py
index d42095f0c..6e4b9d9df 100644
--- a/nova/tests/users_unittest.py
+++ b/nova/tests/users_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py
index 032162dff..6ebce0994 100644
--- a/nova/tests/validator_unittest.py
+++ b/nova/tests/validator_unittest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/twistd.py b/nova/twistd.py
index 566b50c56..44a19e9dc 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/utils.py b/nova/utils.py
index 3339bc940..325b062ee 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/validate.py b/nova/validate.py
index 9d89836a1..820546b73 100644
--- a/nova/validate.py
+++ b/nova/validate.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/vendor.py b/nova/vendor.py
index bb17fe129..77bfe4be5 100644
--- a/nova/vendor.py
+++ b/nova/vendor.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py
index 82e387a4a..ad2181525 100644
--- a/nova/volume/__init__.py
+++ b/nova/volume/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/nova/volume/storage.py b/nova/volume/storage.py
index f2c250e86..1401aef1d 100644
--- a/nova/volume/storage.py
+++ b/nova/volume/storage.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/run_tests.py b/run_tests.py
index bcbb29c62..aea766c92 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/setup.py b/setup.py
index 327e455c5..95d0ee7d1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/__init__.py b/smoketests/__init__.py
index 288c1a42c..ddd6919a0 100644
--- a/smoketests/__init__.py
+++ b/smoketests/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/flags.py b/smoketests/flags.py
index c08ba5a75..6c2131d70 100644
--- a/smoketests/flags.py
+++ b/smoketests/flags.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/novatestcase.py b/smoketests/novatestcase.py
index 7de4288f3..869e31946 100644
--- a/smoketests/novatestcase.py
+++ b/smoketests/novatestcase.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/smoketest.py b/smoketests/smoketest.py
index 47c34ef6f..26e167c8f 100644
--- a/smoketests/smoketest.py
+++ b/smoketests/smoketest.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC
diff --git a/tools/clean-vlans b/tools/clean-vlans
index 7e4f5e538..c345de912 100755
--- a/tools/clean-vlans
+++ b/tools/clean-vlans
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 Anso Labs, LLC