Merge prop fixes

2011-01-26 11:26:54 -06:00 · 2011-01-26 11:26:54 -06:00 · 5afa9e2b18
commit 5afa9e2b18
parent 8f4078821d
49 changed files with 66 additions and 47 deletions
--- a/bin/glance-api
+++ b/bin/glance-api
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/bin/glance-registry
+++ b/bin/glance-registry
@ -1,5 +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.
 # Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
--- a/doc/source/client.rst
+++ b/doc/source/client.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/community.rst
+++ b/doc/source/community.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/gettingstarted.rst
+++ b/doc/source/gettingstarted.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/glanceapi.rst
+++ b/doc/source/glanceapi.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/identifiers.rst
+++ b/doc/source/identifiers.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/registries.rst
+++ b/doc/source/registries.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/doc/source/statuses.rst
+++ b/doc/source/statuses.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC
+      Copyright 2010 OpenStack, LLC
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/init.py
+++ b/glance/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/client.py
+++ b/glance/client.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/common/init.py
+++ b/glance/common/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/common/db/init.py
+++ b/glance/common/db/init.py
@ -1,6 +1,8 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/common/db/sqlalchemy/init.py
+++ b/glance/common/db/sqlalchemy/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/common/db/sqlalchemy/session.py
+++ b/glance/common/db/sqlalchemy/session.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/common/exception.py
+++ b/glance/common/exception.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/common/flags.py
+++ b/glance/common/flags.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/common/server.py
+++ b/glance/common/server.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/common/utils.py
+++ b/glance/common/utils.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/registry/init.py
+++ b/glance/registry/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/registry/client.py
+++ b/glance/registry/client.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/registry/db/init.py
+++ b/glance/registry/db/init.py
@ -1,6 +1,8 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/registry/db/api.py
+++ b/glance/registry/db/api.py
@ -1,6 +1,8 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/registry/db/sqlalchemy/init.py
+++ b/glance/registry/db/sqlalchemy/init.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/registry/db/sqlalchemy/api.py
+++ b/glance/registry/db/sqlalchemy/api.py
@ -1,5 +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.
 # Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
--- a/glance/registry/db/sqlalchemy/models.py
+++ b/glance/registry/db/sqlalchemy/models.py
@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack 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
--- a/glance/registry/server.py
+++ b/glance/registry/server.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/server.py
+++ b/glance/server.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/store/init.py
+++ b/glance/store/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/store/backends/init.py
+++ b/glance/store/backends/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/store/filesystem.py
+++ b/glance/store/filesystem.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/store/http.py
+++ b/glance/store/http.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/store/s3.py
+++ b/glance/store/s3.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/store/swift.py
+++ b/glance/store/swift.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/util.py
+++ b/glance/util.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/run_tests.py
+++ b/run_tests.py
@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
--- a/tests/init.py
+++ b/tests/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/stubs.py
+++ b/tests/stubs.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/unit/init.py
+++ b/tests/unit/init.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/unit/swiftfakehttp.py
+++ b/tests/unit/swiftfakehttp.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/unit/test_clients.py
+++ b/tests/unit/test_clients.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/unit/test_misc.py
+++ b/tests/unit/test_misc.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-#    Copyright 2011 OpenStack LLC
+#    Copyright 2010-2011 OpenStack LLC
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
--- a/tests/unit/test_registry_api.py
+++ b/tests/unit/test_registry_api.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/unit/test_stores.py
+++ b/tests/unit/test_stores.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tests/utils.py
+++ b/tests/utils.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2011 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may