diff --git a/bin/glance-api b/bin/glance-api index 1884f3ca91..6364112cb3 100755 --- 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 diff --git a/bin/glance-registry b/bin/glance-registry index 32d2c5a9a1..e151c6ab9b 100755 --- 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. # diff --git a/doc/source/client.rst b/doc/source/client.rst index 48051473dd..97ae0feaf5 100644 --- 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 diff --git a/doc/source/community.rst b/doc/source/community.rst index d7abd39f80..7b73b6497a 100644 --- 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 diff --git a/doc/source/gettingstarted.rst b/doc/source/gettingstarted.rst index e0e65e7222..e0abbe3075 100644 --- 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 diff --git a/doc/source/glanceapi.rst b/doc/source/glanceapi.rst index 67015223ef..ea8493b56e 100644 --- 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 diff --git a/doc/source/identifiers.rst b/doc/source/identifiers.rst index 4280d5a511..f85cdfcd88 100644 --- 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 diff --git a/doc/source/index.rst b/doc/source/index.rst index 26657a6d9f..6716452c24 100644 --- 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 diff --git a/doc/source/registries.rst b/doc/source/registries.rst index 97fe147c7c..911562d4e0 100644 --- 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 diff --git a/doc/source/statuses.rst b/doc/source/statuses.rst index 9210f0da82..c9c875f2b3 100644 --- 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 diff --git a/glance/__init__.py b/glance/__init__.py index d65c689a83..b60695702c 100644 --- 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 diff --git a/glance/client.py b/glance/client.py index 809a9188fb..8d0ac3de89 100644 --- 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 diff --git a/glance/common/__init__.py b/glance/common/__init__.py index d65c689a83..b60695702c 100644 --- 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 diff --git a/glance/common/db/__init__.py b/glance/common/db/__init__.py index c4c506926c..13b461acfc 100644 --- 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 diff --git a/glance/common/db/sqlalchemy/__init__.py b/glance/common/db/sqlalchemy/__init__.py index d65c689a83..b60695702c 100644 --- 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 diff --git a/glance/common/db/sqlalchemy/session.py b/glance/common/db/sqlalchemy/session.py index 2de1de1e62..4fd03762c4 100644 --- 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 diff --git a/glance/common/exception.py b/glance/common/exception.py index a341c880a0..b95541df41 100644 --- 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 diff --git a/glance/common/flags.py b/glance/common/flags.py index e57840db90..2895af6978 100644 --- 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 diff --git a/glance/common/server.py b/glance/common/server.py index 447be00837..9bd82f00ae 100644 --- 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 diff --git a/glance/common/utils.py b/glance/common/utils.py index f242f0ca65..51e63e3b4a 100644 --- 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 diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py index a32e4c86d6..029f7e82cd 100644 --- 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 diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py index c1257bd066..1d82c556c4 100644 --- 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 diff --git a/glance/registry/client.py b/glance/registry/client.py index f2dc5fd1b6..a622129e5e 100644 --- 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 diff --git a/glance/registry/db/__init__.py b/glance/registry/db/__init__.py index e6bd4b6971..c73cf36a28 100644 --- 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 diff --git a/glance/registry/db/api.py b/glance/registry/db/api.py index 4b20e71db4..9b802e6c47 100644 --- 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 diff --git a/glance/registry/db/sqlalchemy/__init__.py b/glance/registry/db/sqlalchemy/__init__.py index 0c1e1cb8f0..a16703b63f 100644 --- 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 diff --git a/glance/registry/db/sqlalchemy/api.py b/glance/registry/db/sqlalchemy/api.py index e5eb5ce1b6..42fc6c3b9f 100644 --- 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. # diff --git a/glance/registry/db/sqlalchemy/models.py b/glance/registry/db/sqlalchemy/models.py index 0fea28d743..2c963b350e 100644 --- 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 diff --git a/glance/registry/server.py b/glance/registry/server.py index 8173dbabe4..6c77de8121 100644 --- 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 diff --git a/glance/server.py b/glance/server.py index 145223451c..a8f073b0ef 100644 --- 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 diff --git a/glance/store/__init__.py b/glance/store/__init__.py index 6db2900189..5e1a8bc23c 100644 --- 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 diff --git a/glance/store/backends/__init__.py b/glance/store/backends/__init__.py index ef9ecccae0..7a66459765 100644 --- 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 diff --git a/glance/store/filesystem.py b/glance/store/filesystem.py index 0ee080e6ee..1977c0a9d7 100644 --- 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 diff --git a/glance/store/http.py b/glance/store/http.py index f4bdc0fac0..4e713f2bfb 100644 --- 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 diff --git a/glance/store/s3.py b/glance/store/s3.py index 866d18b487..694fcfc6bf 100644 --- 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 diff --git a/glance/store/swift.py b/glance/store/swift.py index 94e60c5f93..8caab8dbc6 100644 --- 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 diff --git a/glance/util.py b/glance/util.py index 4d24298bc6..0caca8b8ba 100644 --- 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 diff --git a/run_tests.py b/run_tests.py index a9f3789f2e..a63fcfaf85 100644 --- 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"); diff --git a/tests/__init__.py b/tests/__init__.py index d65c689a83..b60695702c 100644 --- 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 diff --git a/tests/stubs.py b/tests/stubs.py index 03eec73e8e..d9716db972 100644 --- 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 diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index d65c689a83..b60695702c 100644 --- 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 diff --git a/tests/unit/swiftfakehttp.py b/tests/unit/swiftfakehttp.py index c8c83d3af0..54f7ec1945 100644 --- 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 diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py index b229b25047..f3fdf4f1ef 100644 --- 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 diff --git a/tests/unit/test_clients.py b/tests/unit/test_clients.py index 7fc325ed91..5858c599a9 100644 --- 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 diff --git a/tests/unit/test_misc.py b/tests/unit/test_misc.py index dd67456a54..07f1108c7c 100644 --- 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 diff --git a/tests/unit/test_registry_api.py b/tests/unit/test_registry_api.py index 846af3b451..36ef5c02fe 100644 --- 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 diff --git a/tests/unit/test_stores.py b/tests/unit/test_stores.py index 924b371cb7..599ec4465a 100644 --- 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 diff --git a/tests/utils.py b/tests/utils.py index d5e1ed8a26..6c6268e914 100644 --- 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 diff --git a/tools/install_venv.py b/tools/install_venv.py index 0986d6a813..68a6190590 100644 --- 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