summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-07 16:09:37 +0000
committerGerrit Code Review <review@openstack.org>2013-10-07 16:09:37 +0000
commit0b594bc3afbffe942edebe9cdf02f60c06e627ab (patch)
treed32a787877146c24dcf98f0a7692c35b2d4e330a
parent22372eadfe47f014ca977120224b77602c11f48b (diff)
parentf72704fc82803254a6f335fa2a7d2459f86f877d (diff)
downloadswift-0b594bc3afbffe942edebe9cdf02f60c06e627ab.tar.gz
Merge "Change OpenStack LLC to Foundation"
-rw-r--r--AUTHORS2
-rwxr-xr-xbin/swift-account-audit2
-rwxr-xr-xbin/swift-account-auditor2
-rwxr-xr-xbin/swift-account-reaper2
-rwxr-xr-xbin/swift-account-replicator2
-rwxr-xr-xbin/swift-account-server2
-rwxr-xr-xbin/swift-bench2
-rwxr-xr-xbin/swift-bench-client2
-rwxr-xr-xbin/swift-container-auditor2
-rwxr-xr-xbin/swift-container-replicator2
-rwxr-xr-xbin/swift-container-server2
-rwxr-xr-xbin/swift-container-sync2
-rwxr-xr-xbin/swift-container-updater2
-rwxr-xr-xbin/swift-dispersion-populate2
-rwxr-xr-xbin/swift-dispersion-report2
-rwxr-xr-xbin/swift-drive-audit2
-rwxr-xr-xbin/swift-get-nodes2
-rwxr-xr-xbin/swift-init2
-rwxr-xr-xbin/swift-object-auditor2
-rwxr-xr-xbin/swift-object-expirer2
-rwxr-xr-xbin/swift-object-info2
-rwxr-xr-xbin/swift-object-replicator2
-rwxr-xr-xbin/swift-object-server2
-rwxr-xr-xbin/swift-object-updater2
-rwxr-xr-xbin/swift-proxy-server2
-rwxr-xr-xbin/swift-ring-builder2
-rw-r--r--doc/source/index.rst2
-rw-r--r--swift/account/auditor.py2
-rw-r--r--swift/account/backend.py2
-rw-r--r--swift/account/reaper.py2
-rw-r--r--swift/account/replicator.py2
-rw-r--r--swift/account/server.py2
-rw-r--r--swift/account/utils.py2
-rw-r--r--swift/common/bench.py2
-rw-r--r--swift/common/bufferedhttp.py2
-rw-r--r--swift/common/constraints.py2
-rw-r--r--swift/common/daemon.py2
-rw-r--r--swift/common/db.py2
-rw-r--r--swift/common/db_replicator.py2
-rw-r--r--swift/common/direct_client.py2
-rw-r--r--swift/common/exceptions.py2
-rw-r--r--swift/common/http.py2
-rw-r--r--swift/common/internal_client.py2
-rw-r--r--swift/common/manager.py2
-rw-r--r--swift/common/memcached.py2
-rw-r--r--swift/common/middleware/acl.py2
-rw-r--r--swift/common/middleware/bulk.py2
-rw-r--r--swift/common/middleware/catch_errors.py2
-rw-r--r--swift/common/middleware/cname_lookup.py2
-rw-r--r--swift/common/middleware/container_quotas.py2
-rw-r--r--swift/common/middleware/domain_remap.py2
-rw-r--r--swift/common/middleware/formpost.py2
-rw-r--r--swift/common/middleware/healthcheck.py2
-rw-r--r--swift/common/middleware/keystoneauth.py2
-rw-r--r--swift/common/middleware/list_endpoints.py2
-rw-r--r--swift/common/middleware/memcache.py2
-rw-r--r--swift/common/middleware/name_check.py2
-rw-r--r--swift/common/middleware/proxy_logging.py2
-rw-r--r--swift/common/middleware/ratelimit.py2
-rw-r--r--swift/common/middleware/recon.py2
-rw-r--r--swift/common/middleware/slo.py2
-rw-r--r--swift/common/middleware/staticweb.py2
-rw-r--r--swift/common/middleware/tempauth.py2
-rw-r--r--swift/common/middleware/tempurl.py2
-rw-r--r--swift/common/ondisk.py2
-rw-r--r--swift/common/request_helpers.py2
-rw-r--r--swift/common/ring/builder.py2
-rw-r--r--swift/common/ring/ring.py2
-rw-r--r--swift/common/ring/utils.py2
-rw-r--r--swift/common/swob.py2
-rw-r--r--swift/common/utils.py2
-rw-r--r--swift/common/wsgi.py2
-rw-r--r--swift/container/auditor.py2
-rw-r--r--swift/container/backend.py2
-rw-r--r--swift/container/replicator.py2
-rw-r--r--swift/container/server.py2
-rw-r--r--swift/container/sync.py2
-rw-r--r--swift/container/updater.py2
-rw-r--r--swift/obj/auditor.py2
-rw-r--r--swift/obj/diskfile.py2
-rw-r--r--swift/obj/expirer.py2
-rw-r--r--swift/obj/replicator.py2
-rw-r--r--swift/obj/server.py2
-rw-r--r--swift/obj/updater.py2
-rw-r--r--swift/proxy/controllers/account.py2
-rw-r--r--swift/proxy/controllers/base.py2
-rw-r--r--swift/proxy/controllers/container.py2
-rw-r--r--swift/proxy/controllers/obj.py2
-rw-r--r--swift/proxy/server.py2
-rw-r--r--test/__init__.py2
-rw-r--r--test/functional/swift_test_client.py2
-rw-r--r--test/functional/tests.py2
-rw-r--r--test/functionalnosetests/swift_testing.py2
-rwxr-xr-xtest/functionalnosetests/test_account.py2
-rwxr-xr-xtest/functionalnosetests/test_container.py2
-rwxr-xr-xtest/functionalnosetests/test_object.py2
-rw-r--r--test/probe/common.py2
-rwxr-xr-xtest/probe/test_account_failures.py2
-rwxr-xr-xtest/probe/test_account_get_fake_responses_match.py2
-rwxr-xr-xtest/probe/test_container_failures.py2
-rw-r--r--test/probe/test_empty_device_handoff.py2
-rwxr-xr-xtest/probe/test_object_async_update.py2
-rwxr-xr-xtest/probe/test_object_failures.py2
-rwxr-xr-xtest/probe/test_object_handoff.py2
-rw-r--r--test/probe/test_replication_servers_working.py2
-rw-r--r--test/unit/__init__.py2
-rw-r--r--test/unit/account/test_auditor.py2
-rw-r--r--test/unit/account/test_backend.py2
-rw-r--r--test/unit/account/test_reaper.py2
-rw-r--r--test/unit/account/test_replicator.py2
-rw-r--r--test/unit/account/test_server.py2
-rw-r--r--test/unit/common/middleware/test_acl.py2
-rw-r--r--test/unit/common/middleware/test_bulk.py2
-rw-r--r--test/unit/common/middleware/test_cname_lookup.py2
-rw-r--r--test/unit/common/middleware/test_domain_remap.py2
-rw-r--r--test/unit/common/middleware/test_except.py2
-rw-r--r--test/unit/common/middleware/test_formpost.py2
-rw-r--r--test/unit/common/middleware/test_healthcheck.py2
-rw-r--r--test/unit/common/middleware/test_keystoneauth.py2
-rw-r--r--test/unit/common/middleware/test_list_endpoints.py2
-rw-r--r--test/unit/common/middleware/test_memcache.py2
-rw-r--r--test/unit/common/middleware/test_name_check.py2
-rw-r--r--test/unit/common/middleware/test_proxy_logging.py2
-rw-r--r--test/unit/common/middleware/test_quotas.py2
-rw-r--r--test/unit/common/middleware/test_ratelimit.py2
-rw-r--r--test/unit/common/middleware/test_recon.py2
-rw-r--r--test/unit/common/middleware/test_slo.py2
-rw-r--r--test/unit/common/middleware/test_staticweb.py2
-rw-r--r--test/unit/common/middleware/test_tempauth.py2
-rw-r--r--test/unit/common/middleware/test_tempurl.py2
-rw-r--r--test/unit/common/ring/test_builder.py2
-rw-r--r--test/unit/common/ring/test_ring.py2
-rw-r--r--test/unit/common/ring/test_utils.py2
-rw-r--r--test/unit/common/test_bench.py2
-rw-r--r--test/unit/common/test_bufferedhttp.py2
-rw-r--r--test/unit/common/test_constraints.py2
-rw-r--r--test/unit/common/test_daemon.py2
-rw-r--r--test/unit/common/test_db.py2
-rw-r--r--test/unit/common/test_db_replicator.py2
-rw-r--r--test/unit/common/test_direct_client.py2
-rw-r--r--test/unit/common/test_exceptions.py2
-rw-r--r--test/unit/common/test_internal_client.py2
-rw-r--r--test/unit/common/test_manager.py2
-rw-r--r--test/unit/common/test_memcached.py2
-rw-r--r--test/unit/common/test_ondisk.py2
-rw-r--r--test/unit/common/test_swob.py2
-rw-r--r--test/unit/common/test_utils.py2
-rw-r--r--test/unit/common/test_wsgi.py2
-rw-r--r--test/unit/container/test_auditor.py2
-rw-r--r--test/unit/container/test_backend.py2
-rw-r--r--test/unit/container/test_replicator.py2
-rw-r--r--test/unit/container/test_server.py2
-rw-r--r--test/unit/container/test_sync.py2
-rw-r--r--test/unit/container/test_updater.py2
-rw-r--r--test/unit/obj/test_auditor.py2
-rw-r--r--test/unit/obj/test_diskfile.py2
-rw-r--r--test/unit/obj/test_expirer.py2
-rw-r--r--test/unit/obj/test_replicator.py2
-rwxr-xr-xtest/unit/obj/test_server.py2
-rw-r--r--test/unit/obj/test_updater.py2
-rw-r--r--test/unit/proxy/controllers/test_account.py2
-rw-r--r--test/unit/proxy/controllers/test_base.py2
-rw-r--r--test/unit/proxy/controllers/test_container.py2
-rwxr-xr-xtest/unit/proxy/controllers/test_obj.py2
-rw-r--r--test/unit/proxy/test_server.py2
165 files changed, 165 insertions, 165 deletions
diff --git a/AUTHORS b/AUTHORS
index 174484fbc..3571494d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
Maintainer
----------
-OpenStack, LLC.
+OpenStack Foundation
IRC: #openstack on irc.freenode.net
Original Authors
diff --git a/bin/swift-account-audit b/bin/swift-account-audit
index 026aa2f89..aa3bce477 100755
--- a/bin/swift-account-audit
+++ b/bin/swift-account-audit
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-account-auditor b/bin/swift-account-auditor
index a342f6ae2..f7895c8cc 100755
--- a/bin/swift-account-auditor
+++ b/bin/swift-account-auditor
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-account-reaper b/bin/swift-account-reaper
index 2f07153df..885c4fd75 100755
--- a/bin/swift-account-reaper
+++ b/bin/swift-account-reaper
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-account-replicator b/bin/swift-account-replicator
index b112f015d..fec6d49ef 100755
--- a/bin/swift-account-replicator
+++ b/bin/swift-account-replicator
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-account-server b/bin/swift-account-server
index 13dd048bf..9b8f1e58a 100755
--- a/bin/swift-account-server
+++ b/bin/swift-account-server
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-bench b/bin/swift-bench
index 04a0428ee..ecdf5f5a1 100755
--- a/bin/swift-bench
+++ b/bin/swift-bench
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-bench-client b/bin/swift-bench-client
index 9473b4560..d003fd892 100755
--- a/bin/swift-bench-client
+++ b/bin/swift-bench-client
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-container-auditor b/bin/swift-container-auditor
index b49a290f3..5021513f0 100755
--- a/bin/swift-container-auditor
+++ b/bin/swift-container-auditor
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-container-replicator b/bin/swift-container-replicator
index 62b803c0c..b3b235ef9 100755
--- a/bin/swift-container-replicator
+++ b/bin/swift-container-replicator
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-container-server b/bin/swift-container-server
index b47dce017..aef038ca6 100755
--- a/bin/swift-container-server
+++ b/bin/swift-container-server
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-container-sync b/bin/swift-container-sync
index 7b6378c4c..14d6bc9d7 100755
--- a/bin/swift-container-sync
+++ b/bin/swift-container-sync
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-container-updater b/bin/swift-container-updater
index b80cbda09..96c38f04b 100755
--- a/bin/swift-container-updater
+++ b/bin/swift-container-updater
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-dispersion-populate b/bin/swift-dispersion-populate
index 1c48526f5..06f5e4e7c 100755
--- a/bin/swift-dispersion-populate
+++ b/bin/swift-dispersion-populate
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-dispersion-report b/bin/swift-dispersion-report
index d5b42eff5..3734b7c78 100755
--- a/bin/swift-dispersion-report
+++ b/bin/swift-dispersion-report
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-drive-audit b/bin/swift-drive-audit
index 7dbf5e256..ece1726c7 100755
--- a/bin/swift-drive-audit
+++ b/bin/swift-drive-audit
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-get-nodes b/bin/swift-get-nodes
index 279f8d826..36cfb7eca 100755
--- a/bin/swift-get-nodes
+++ b/bin/swift-get-nodes
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-init b/bin/swift-init
index 1d6059e4e..3c992f7c9 100755
--- a/bin/swift-init
+++ b/bin/swift-init
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-object-auditor b/bin/swift-object-auditor
index 2a2d38bfc..356fa9af5 100755
--- a/bin/swift-object-auditor
+++ b/bin/swift-object-auditor
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-object-expirer b/bin/swift-object-expirer
index 90151580f..7deaf5750 100755
--- a/bin/swift-object-expirer
+++ b/bin/swift-object-expirer
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-object-info b/bin/swift-object-info
index dae58c194..da09795db 100755
--- a/bin/swift-object-info
+++ b/bin/swift-object-info
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-object-replicator b/bin/swift-object-replicator
index 2f01a209a..6ad4fa9b2 100755
--- a/bin/swift-object-replicator
+++ b/bin/swift-object-replicator
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-object-server b/bin/swift-object-server
index 3d2aa7e5b..74119d61d 100755
--- a/bin/swift-object-server
+++ b/bin/swift-object-server
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-object-updater b/bin/swift-object-updater
index c7f04c965..14ed55c2b 100755
--- a/bin/swift-object-updater
+++ b/bin/swift-object-updater
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-proxy-server b/bin/swift-proxy-server
index 9aa938ddb..449a8d828 100755
--- a/bin/swift-proxy-server
+++ b/bin/swift-proxy-server
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder
index 949e2e317..3bd804a02 100755
--- a/bin/swift-ring-builder
+++ b/bin/swift-ring-builder
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 9223e9a70..18223efd9 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,5 +1,5 @@
..
- Copyright 2010-2012 OpenStack LLC
+ Copyright 2010-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/swift/account/auditor.py b/swift/account/auditor.py
index a85839ad7..e60e58f2c 100644
--- a/swift/account/auditor.py
+++ b/swift/account/auditor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/account/backend.py b/swift/account/backend.py
index 6a889fbb7..c5d661a11 100644
--- a/swift/account/backend.py
+++ b/swift/account/backend.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/account/reaper.py b/swift/account/reaper.py
index 488f1c541..544dcb52c 100644
--- a/swift/account/reaper.py
+++ b/swift/account/reaper.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/account/replicator.py b/swift/account/replicator.py
index a4ee4373b..52205b632 100644
--- a/swift/account/replicator.py
+++ b/swift/account/replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/account/server.py b/swift/account/server.py
index da27fe613..5ed982ec9 100644
--- a/swift/account/server.py
+++ b/swift/account/server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/account/utils.py b/swift/account/utils.py
index 919c05c02..c40dbc7ed 100644
--- a/swift/account/utils.py
+++ b/swift/account/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/bench.py b/swift/common/bench.py
index 98066959e..b588343aa 100644
--- a/swift/common/bench.py
+++ b/swift/common/bench.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/bufferedhttp.py b/swift/common/bufferedhttp.py
index b16147c81..f6f737064 100644
--- a/swift/common/bufferedhttp.py
+++ b/swift/common/bufferedhttp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/constraints.py b/swift/common/constraints.py
index f1d300a03..40c7e5a21 100644
--- a/swift/common/constraints.py
+++ b/swift/common/constraints.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/daemon.py b/swift/common/daemon.py
index 25de076c6..11b86a430 100644
--- a/swift/common/daemon.py
+++ b/swift/common/daemon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/db.py b/swift/common/db.py
index 0fd4900e0..3e14d176b 100644
--- a/swift/common/db.py
+++ b/swift/common/db.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/db_replicator.py b/swift/common/db_replicator.py
index b0965296f..4fba675a8 100644
--- a/swift/common/db_replicator.py
+++ b/swift/common/db_replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/direct_client.py b/swift/common/direct_client.py
index ab283026d..f7a954dcd 100644
--- a/swift/common/direct_client.py
+++ b/swift/common/direct_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/exceptions.py b/swift/common/exceptions.py
index 2b9f8ea4b..d6322f979 100644
--- a/swift/common/exceptions.py
+++ b/swift/common/exceptions.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/http.py b/swift/common/http.py
index 803111540..1eccf9b95 100644
--- a/swift/common/http.py
+++ b/swift/common/http.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/internal_client.py b/swift/common/internal_client.py
index 53ca049d9..36054085c 100644
--- a/swift/common/internal_client.py
+++ b/swift/common/internal_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/manager.py b/swift/common/manager.py
index 9e47afdcd..a157d2ca1 100644
--- a/swift/common/manager.py
+++ b/swift/common/manager.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/memcached.py b/swift/common/memcached.py
index d1fe193b6..21431217c 100644
--- a/swift/common/memcached.py
+++ b/swift/common/memcached.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/acl.py b/swift/common/middleware/acl.py
index bbf19b61e..e21d066f7 100644
--- a/swift/common/middleware/acl.py
+++ b/swift/common/middleware/acl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/bulk.py b/swift/common/middleware/bulk.py
index a6effaf99..ea34980f9 100644
--- a/swift/common/middleware/bulk.py
+++ b/swift/common/middleware/bulk.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/catch_errors.py b/swift/common/middleware/catch_errors.py
index 496e0a09a..afb2ea612 100644
--- a/swift/common/middleware/catch_errors.py
+++ b/swift/common/middleware/catch_errors.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/cname_lookup.py b/swift/common/middleware/cname_lookup.py
index 883b255ad..f79d0685c 100644
--- a/swift/common/middleware/cname_lookup.py
+++ b/swift/common/middleware/cname_lookup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/container_quotas.py b/swift/common/middleware/container_quotas.py
index d8d3df031..57f3ce13e 100644
--- a/swift/common/middleware/container_quotas.py
+++ b/swift/common/middleware/container_quotas.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/domain_remap.py b/swift/common/middleware/domain_remap.py
index 7f88435ff..898aca192 100644
--- a/swift/common/middleware/domain_remap.py
+++ b/swift/common/middleware/domain_remap.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/formpost.py b/swift/common/middleware/formpost.py
index dd0e84d35..a76fcde41 100644
--- a/swift/common/middleware/formpost.py
+++ b/swift/common/middleware/formpost.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/healthcheck.py b/swift/common/middleware/healthcheck.py
index 75deda250..5b58e46ee 100644
--- a/swift/common/middleware/healthcheck.py
+++ b/swift/common/middleware/healthcheck.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/keystoneauth.py b/swift/common/middleware/keystoneauth.py
index b26431a92..e72678789 100644
--- a/swift/common/middleware/keystoneauth.py
+++ b/swift/common/middleware/keystoneauth.py
@@ -1,5 +1,5 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
#
# 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/swift/common/middleware/list_endpoints.py b/swift/common/middleware/list_endpoints.py
index 3fa24dcdf..72e179d49 100644
--- a/swift/common/middleware/list_endpoints.py
+++ b/swift/common/middleware/list_endpoints.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/memcache.py b/swift/common/middleware/memcache.py
index ae67c4ac4..3252c7f8f 100644
--- a/swift/common/middleware/memcache.py
+++ b/swift/common/middleware/memcache.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/name_check.py b/swift/common/middleware/name_check.py
index 39411690c..d8ee47b85 100644
--- a/swift/common/middleware/name_check.py
+++ b/swift/common/middleware/name_check.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/proxy_logging.py b/swift/common/middleware/proxy_logging.py
index b40ef36ac..8a65bc4b1 100644
--- a/swift/common/middleware/proxy_logging.py
+++ b/swift/common/middleware/proxy_logging.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.
+# Copyright (c) 2010-2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/ratelimit.py b/swift/common/middleware/ratelimit.py
index a139e8e2d..d60b60221 100644
--- a/swift/common/middleware/ratelimit.py
+++ b/swift/common/middleware/ratelimit.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/recon.py b/swift/common/middleware/recon.py
index 0ecf1ad13..3c37e00ce 100644
--- a/swift/common/middleware/recon.py
+++ b/swift/common/middleware/recon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/slo.py b/swift/common/middleware/slo.py
index 1c98acca3..31d161896 100644
--- a/swift/common/middleware/slo.py
+++ b/swift/common/middleware/slo.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/staticweb.py b/swift/common/middleware/staticweb.py
index 08b3a19d9..b8a9daaac 100644
--- a/swift/common/middleware/staticweb.py
+++ b/swift/common/middleware/staticweb.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/tempauth.py b/swift/common/middleware/tempauth.py
index c871a293a..2a2e8c84f 100644
--- a/swift/common/middleware/tempauth.py
+++ b/swift/common/middleware/tempauth.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py
index 46558df04..ffc14313b 100644
--- a/swift/common/middleware/tempurl.py
+++ b/swift/common/middleware/tempurl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/ondisk.py b/swift/common/ondisk.py
index 8acad105c..86b1d8227 100644
--- a/swift/common/ondisk.py
+++ b/swift/common/ondisk.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/request_helpers.py b/swift/common/request_helpers.py
index 51c846d12..06ad4af09 100644
--- a/swift/common/request_helpers.py
+++ b/swift/common/request_helpers.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/ring/builder.py b/swift/common/ring/builder.py
index 1fccdb157..bb5f92eb0 100644
--- a/swift/common/ring/builder.py
+++ b/swift/common/ring/builder.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/ring/ring.py b/swift/common/ring/ring.py
index 784aeba07..1d16e1b9f 100644
--- a/swift/common/ring/ring.py
+++ b/swift/common/ring/ring.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/ring/utils.py b/swift/common/ring/utils.py
index bf3966751..5ab7e58da 100644
--- a/swift/common/ring/utils.py
+++ b/swift/common/ring/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/swob.py b/swift/common/swob.py
index a8114bb38..868cdb123 100644
--- a/swift/common/swob.py
+++ b/swift/common/swob.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/utils.py b/swift/common/utils.py
index 94bac3b9f..27bb82b54 100644
--- a/swift/common/utils.py
+++ b/swift/common/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/common/wsgi.py b/swift/common/wsgi.py
index f8ff8c2e8..a33b8aa5c 100644
--- a/swift/common/wsgi.py
+++ b/swift/common/wsgi.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/container/auditor.py b/swift/container/auditor.py
index bfcefbc53..fc8f1c664 100644
--- a/swift/container/auditor.py
+++ b/swift/container/auditor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/container/backend.py b/swift/container/backend.py
index f81b946b8..5332333fb 100644
--- a/swift/container/backend.py
+++ b/swift/container/backend.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/container/replicator.py b/swift/container/replicator.py
index 77d0d77f7..116a4a760 100644
--- a/swift/container/replicator.py
+++ b/swift/container/replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/container/server.py b/swift/container/server.py
index 084b06894..487556d06 100644
--- a/swift/container/server.py
+++ b/swift/container/server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/container/sync.py b/swift/container/sync.py
index c014914b5..f90d24f21 100644
--- a/swift/container/sync.py
+++ b/swift/container/sync.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/container/updater.py b/swift/container/updater.py
index d6f0edbd6..96c35a0cd 100644
--- a/swift/container/updater.py
+++ b/swift/container/updater.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py
index cd674b7e7..67b9f8d9e 100644
--- a/swift/obj/auditor.py
+++ b/swift/obj/auditor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py
index b8326d3e4..47e342c07 100644
--- a/swift/obj/diskfile.py
+++ b/swift/obj/diskfile.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/obj/expirer.py b/swift/obj/expirer.py
index 6741ae1e5..cd355a28c 100644
--- a/swift/obj/expirer.py
+++ b/swift/obj/expirer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/obj/replicator.py b/swift/obj/replicator.py
index e7639d35e..066ca7b52 100644
--- a/swift/obj/replicator.py
+++ b/swift/obj/replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/obj/server.py b/swift/obj/server.py
index a89c8ff2b..13d106faf 100644
--- a/swift/obj/server.py
+++ b/swift/obj/server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/obj/updater.py b/swift/obj/updater.py
index 857966fb9..f519cd341 100644
--- a/swift/obj/updater.py
+++ b/swift/obj/updater.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/proxy/controllers/account.py b/swift/proxy/controllers/account.py
index cc1ce41f0..2d2aa3667 100644
--- a/swift/proxy/controllers/account.py
+++ b/swift/proxy/controllers/account.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py
index df7828bd0..55b09f29a 100644
--- a/swift/proxy/controllers/base.py
+++ b/swift/proxy/controllers/base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/proxy/controllers/container.py b/swift/proxy/controllers/container.py
index e282e869f..2c38ba44c 100644
--- a/swift/proxy/controllers/container.py
+++ b/swift/proxy/controllers/container.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py
index b8a36dedc..5523283e4 100644
--- a/swift/proxy/controllers/obj.py
+++ b/swift/proxy/controllers/obj.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index 57854ddaa..bbc439f5b 100644
--- a/swift/proxy/server.py
+++ b/swift/proxy/server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/__init__.py b/test/__init__.py
index 72dff139b..7eb5f4775 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py
index 061497a0b..2a161ac6a 100644
--- a/test/functional/swift_test_client.py
+++ b/test/functional/swift_test_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/functional/tests.py b/test/functional/tests.py
index 3707082dc..d34489c41 100644
--- a/test/functional/tests.py
+++ b/test/functional/tests.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/functionalnosetests/swift_testing.py b/test/functionalnosetests/swift_testing.py
index 3260867cc..50abc8e1b 100644
--- a/test/functionalnosetests/swift_testing.py
+++ b/test/functionalnosetests/swift_testing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/functionalnosetests/test_account.py b/test/functionalnosetests/test_account.py
index b88c9b8de..b2f743ffe 100755
--- a/test/functionalnosetests/test_account.py
+++ b/test/functionalnosetests/test_account.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/functionalnosetests/test_container.py b/test/functionalnosetests/test_container.py
index 9e344831e..15f7fc14e 100755
--- a/test/functionalnosetests/test_container.py
+++ b/test/functionalnosetests/test_container.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/functionalnosetests/test_object.py b/test/functionalnosetests/test_object.py
index 17e58c823..97cd8d0f2 100755
--- a/test/functionalnosetests/test_object.py
+++ b/test/functionalnosetests/test_object.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/common.py b/test/probe/common.py
index 8a88a902c..4a23f80be 100644
--- a/test/probe/common.py
+++ b/test/probe/common.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_account_failures.py b/test/probe/test_account_failures.py
index b65b182e2..facbacc92 100755
--- a/test/probe/test_account_failures.py
+++ b/test/probe/test_account_failures.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_account_get_fake_responses_match.py b/test/probe/test_account_get_fake_responses_match.py
index af7673fa1..5f83fa4b4 100755
--- a/test/probe/test_account_get_fake_responses_match.py
+++ b/test/probe/test_account_get_fake_responses_match.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_container_failures.py b/test/probe/test_container_failures.py
index 7c2ba673c..a263525e9 100755
--- a/test/probe/test_container_failures.py
+++ b/test/probe/test_container_failures.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_empty_device_handoff.py b/test/probe/test_empty_device_handoff.py
index 74bc3c2be..93cf5e167 100644
--- a/test/probe/test_empty_device_handoff.py
+++ b/test/probe/test_empty_device_handoff.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_object_async_update.py b/test/probe/test_object_async_update.py
index 6edd8f4e6..4b6c91b65 100755
--- a/test/probe/test_object_async_update.py
+++ b/test/probe/test_object_async_update.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_object_failures.py b/test/probe/test_object_failures.py
index b46dd330b..b9f8b6af8 100755
--- a/test/probe/test_object_failures.py
+++ b/test/probe/test_object_failures.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_object_handoff.py b/test/probe/test_object_handoff.py
index cf2ae3c14..5619441d1 100755
--- a/test/probe/test_object_handoff.py
+++ b/test/probe/test_object_handoff.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/probe/test_replication_servers_working.py b/test/probe/test_replication_servers_working.py
index 595571290..96f0de1c9 100644
--- a/test/probe/test_replication_servers_working.py
+++ b/test/probe/test_replication_servers_working.py
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/__init__.py b/test/unit/__init__.py
index 72ca8cf33..273f58887 100644
--- a/test/unit/__init__.py
+++ b/test/unit/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/account/test_auditor.py b/test/unit/account/test_auditor.py
index 90a323e94..f7abbed47 100644
--- a/test/unit/account/test_auditor.py
+++ b/test/unit/account/test_auditor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/account/test_backend.py b/test/unit/account/test_backend.py
index 66f425038..19fa7aea8 100644
--- a/test/unit/account/test_backend.py
+++ b/test/unit/account/test_backend.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/account/test_reaper.py b/test/unit/account/test_reaper.py
index 4cd46fa5c..21e6b6475 100644
--- a/test/unit/account/test_reaper.py
+++ b/test/unit/account/test_reaper.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/account/test_replicator.py b/test/unit/account/test_replicator.py
index 26c482c19..0bba02325 100644
--- a/test/unit/account/test_replicator.py
+++ b/test/unit/account/test_replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/account/test_server.py b/test/unit/account/test_server.py
index c545ee050..b3192ea83 100644
--- a/test/unit/account/test_server.py
+++ b/test/unit/account/test_server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_acl.py b/test/unit/common/middleware/test_acl.py
index 8f958a8d7..dcc2a1e33 100644
--- a/test/unit/common/middleware/test_acl.py
+++ b/test/unit/common/middleware/test_acl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_bulk.py b/test/unit/common/middleware/test_bulk.py
index e51c4ee6a..29181b3c3 100644
--- a/test/unit/common/middleware/test_bulk.py
+++ b/test/unit/common/middleware/test_bulk.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_cname_lookup.py b/test/unit/common/middleware/test_cname_lookup.py
index 3771d04a6..2ffcfbf56 100644
--- a/test/unit/common/middleware/test_cname_lookup.py
+++ b/test/unit/common/middleware/test_cname_lookup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_domain_remap.py b/test/unit/common/middleware/test_domain_remap.py
index 97c80d16a..79192072d 100644
--- a/test/unit/common/middleware/test_domain_remap.py
+++ b/test/unit/common/middleware/test_domain_remap.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_except.py b/test/unit/common/middleware/test_except.py
index e8936778f..48ad583cc 100644
--- a/test/unit/common/middleware/test_except.py
+++ b/test/unit/common/middleware/test_except.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_formpost.py b/test/unit/common/middleware/test_formpost.py
index 282497b7f..c1e3bf7f7 100644
--- a/test/unit/common/middleware/test_formpost.py
+++ b/test/unit/common/middleware/test_formpost.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_healthcheck.py b/test/unit/common/middleware/test_healthcheck.py
index d189d3e6e..2cd6faf79 100644
--- a/test/unit/common/middleware/test_healthcheck.py
+++ b/test/unit/common/middleware/test_healthcheck.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_keystoneauth.py b/test/unit/common/middleware/test_keystoneauth.py
index 0f931557d..d76007479 100644
--- a/test/unit/common/middleware/test_keystoneauth.py
+++ b/test/unit/common/middleware/test_keystoneauth.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_list_endpoints.py b/test/unit/common/middleware/test_list_endpoints.py
index 8da02382a..c3ed3c882 100644
--- a/test/unit/common/middleware/test_list_endpoints.py
+++ b/test/unit/common/middleware/test_list_endpoints.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_memcache.py b/test/unit/common/middleware/test_memcache.py
index 27fe2aac0..8d3d7781d 100644
--- a/test/unit/common/middleware/test_memcache.py
+++ b/test/unit/common/middleware/test_memcache.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_name_check.py b/test/unit/common/middleware/test_name_check.py
index 289eafd48..6ccd182b0 100644
--- a/test/unit/common/middleware/test_name_check.py
+++ b/test/unit/common/middleware/test_name_check.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_proxy_logging.py b/test/unit/common/middleware/test_proxy_logging.py
index bf97bf6c4..a9d4d48dc 100644
--- a/test/unit/common/middleware/test_proxy_logging.py
+++ b/test/unit/common/middleware/test_proxy_logging.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.
+# Copyright (c) 2010-2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_quotas.py b/test/unit/common/middleware/test_quotas.py
index f33e7a21d..cbc4060a1 100644
--- a/test/unit/common/middleware/test_quotas.py
+++ b/test/unit/common/middleware/test_quotas.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_ratelimit.py b/test/unit/common/middleware/test_ratelimit.py
index 66c2d1e00..aea118758 100644
--- a/test/unit/common/middleware/test_ratelimit.py
+++ b/test/unit/common/middleware/test_ratelimit.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_recon.py b/test/unit/common/middleware/test_recon.py
index c015e2056..ba72f67b9 100644
--- a/test/unit/common/middleware/test_recon.py
+++ b/test/unit/common/middleware/test_recon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_slo.py b/test/unit/common/middleware/test_slo.py
index 853375606..929453aac 100644
--- a/test/unit/common/middleware/test_slo.py
+++ b/test/unit/common/middleware/test_slo.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_staticweb.py b/test/unit/common/middleware/test_staticweb.py
index 34db59eb4..712dee38c 100644
--- a/test/unit/common/middleware/test_staticweb.py
+++ b/test/unit/common/middleware/test_staticweb.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 OpenStack, LLC.
+# Copyright (c) 2010 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_tempauth.py b/test/unit/common/middleware/test_tempauth.py
index b186ba86a..8eafa4a88 100644
--- a/test/unit/common/middleware/test_tempauth.py
+++ b/test/unit/common/middleware/test_tempauth.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/middleware/test_tempurl.py b/test/unit/common/middleware/test_tempurl.py
index ccb2bc856..a3a5ac1a0 100644
--- a/test/unit/common/middleware/test_tempurl.py
+++ b/test/unit/common/middleware/test_tempurl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/ring/test_builder.py b/test/unit/common/ring/test_builder.py
index e21fbb3d5..d6b78a103 100644
--- a/test/unit/common/ring/test_builder.py
+++ b/test/unit/common/ring/test_builder.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/ring/test_ring.py b/test/unit/common/ring/test_ring.py
index d47ee564f..92410e5f6 100644
--- a/test/unit/common/ring/test_ring.py
+++ b/test/unit/common/ring/test_ring.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/ring/test_utils.py b/test/unit/common/ring/test_utils.py
index c9a74c5d7..da2f43e3e 100644
--- a/test/unit/common/ring/test_utils.py
+++ b/test/unit/common/ring/test_utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_bench.py b/test/unit/common/test_bench.py
index 5364d7975..8aba673f9 100644
--- a/test/unit/common/test_bench.py
+++ b/test/unit/common/test_bench.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_bufferedhttp.py b/test/unit/common/test_bufferedhttp.py
index 1e7af06dd..e3e1f96e1 100644
--- a/test/unit/common/test_bufferedhttp.py
+++ b/test/unit/common/test_bufferedhttp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_constraints.py b/test/unit/common/test_constraints.py
index 9d62b5968..9be063143 100644
--- a/test/unit/common/test_constraints.py
+++ b/test/unit/common/test_constraints.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_daemon.py b/test/unit/common/test_daemon.py
index 246610bdf..47d4233d0 100644
--- a/test/unit/common/test_daemon.py
+++ b/test/unit/common/test_daemon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_db.py b/test/unit/common/test_db.py
index 1ae67df3c..f31809f8a 100644
--- a/test/unit/common/test_db.py
+++ b/test/unit/common/test_db.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_db_replicator.py b/test/unit/common/test_db_replicator.py
index 6913b691e..a0acb16e6 100644
--- a/test/unit/common/test_db_replicator.py
+++ b/test/unit/common/test_db_replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_direct_client.py b/test/unit/common/test_direct_client.py
index c1c63a394..420c4c584 100644
--- a/test/unit/common/test_direct_client.py
+++ b/test/unit/common/test_direct_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_exceptions.py b/test/unit/common/test_exceptions.py
index a32bf8c22..6bd4d9a27 100644
--- a/test/unit/common/test_exceptions.py
+++ b/test/unit/common/test_exceptions.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_internal_client.py b/test/unit/common/test_internal_client.py
index 9569ad66d..6c7e6272e 100644
--- a/test/unit/common/test_internal_client.py
+++ b/test/unit/common/test_internal_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py
index 53679af21..908af73c2 100644
--- a/test/unit/common/test_manager.py
+++ b/test/unit/common/test_manager.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_memcached.py b/test/unit/common/test_memcached.py
index 46363e790..e330758d7 100644
--- a/test/unit/common/test_memcached.py
+++ b/test/unit/common/test_memcached.py
@@ -1,5 +1,5 @@
# -*- coding:utf-8 -*-
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_ondisk.py b/test/unit/common/test_ondisk.py
index 394d008ed..5592f911e 100644
--- a/test/unit/common/test_ondisk.py
+++ b/test/unit/common/test_ondisk.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2013 OpenStack, LLC.
+# Copyright (c) 2010-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_swob.py b/test/unit/common/test_swob.py
index ffdaed851..b075000dd 100644
--- a/test/unit/common/test_swob.py
+++ b/test/unit/common/test_swob.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py
index 58bafc74d..b4bf59dd8 100644
--- a/test/unit/common/test_utils.py
+++ b/test/unit/common/test_utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/common/test_wsgi.py b/test/unit/common/test_wsgi.py
index e5d13aa6f..294ad611d 100644
--- a/test/unit/common/test_wsgi.py
+++ b/test/unit/common/test_wsgi.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 OpenStack, LLC.
+# Copyright (c) 2010 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/container/test_auditor.py b/test/unit/container/test_auditor.py
index de3fb4728..18f832d93 100644
--- a/test/unit/container/test_auditor.py
+++ b/test/unit/container/test_auditor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/container/test_backend.py b/test/unit/container/test_backend.py
index ca7a841fa..cefce984f 100644
--- a/test/unit/container/test_backend.py
+++ b/test/unit/container/test_backend.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/container/test_replicator.py b/test/unit/container/test_replicator.py
index cb31a0e5f..881db4382 100644
--- a/test/unit/container/test_replicator.py
+++ b/test/unit/container/test_replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/container/test_server.py b/test/unit/container/test_server.py
index 627d67cda..a056af09d 100644
--- a/test/unit/container/test_server.py
+++ b/test/unit/container/test_server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/container/test_sync.py b/test/unit/container/test_sync.py
index eaabdb327..f2fc294ff 100644
--- a/test/unit/container/test_sync.py
+++ b/test/unit/container/test_sync.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/container/test_updater.py b/test/unit/container/test_updater.py
index 68bc9dd69..b882b1bfc 100644
--- a/test/unit/container/test_updater.py
+++ b/test/unit/container/test_updater.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/obj/test_auditor.py b/test/unit/obj/test_auditor.py
index deca216ea..e173e2109 100644
--- a/test/unit/obj/test_auditor.py
+++ b/test/unit/obj/test_auditor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index c5db32a66..bbde9b985 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -1,5 +1,5 @@
#-*- coding:utf-8 -*-
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/obj/test_expirer.py b/test/unit/obj/test_expirer.py
index f406e61bd..493de0ff2 100644
--- a/test/unit/obj/test_expirer.py
+++ b/test/unit/obj/test_expirer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/obj/test_replicator.py b/test/unit/obj/test_replicator.py
index ac79f717c..fafa6dc93 100644
--- a/test/unit/obj/test_replicator.py
+++ b/test/unit/obj/test_replicator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py
index 638ccb579..7b0ba5155 100755
--- a/test/unit/obj/test_server.py
+++ b/test/unit/obj/test_server.py
@@ -1,5 +1,5 @@
#-*- coding:utf-8 -*-
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/obj/test_updater.py b/test/unit/obj/test_updater.py
index 97a07d059..d16566de3 100644
--- a/test/unit/obj/test_updater.py
+++ b/test/unit/obj/test_updater.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/proxy/controllers/test_account.py b/test/unit/proxy/controllers/test_account.py
index c364bead1..394ada73f 100644
--- a/test/unit/proxy/controllers/test_account.py
+++ b/test/unit/proxy/controllers/test_account.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/proxy/controllers/test_base.py b/test/unit/proxy/controllers/test_base.py
index ea72cc1a6..8214b988a 100644
--- a/test/unit/proxy/controllers/test_base.py
+++ b/test/unit/proxy/controllers/test_base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/proxy/controllers/test_container.py b/test/unit/proxy/controllers/test_container.py
index 516b3fd25..63e6b0e03 100644
--- a/test/unit/proxy/controllers/test_container.py
+++ b/test/unit/proxy/controllers/test_container.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/proxy/controllers/test_obj.py b/test/unit/proxy/controllers/test_obj.py
index a3f3539ff..cae62b08c 100755
--- a/test/unit/proxy/controllers/test_obj.py
+++ b/test/unit/proxy/controllers/test_obj.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 85056cf42..3ad5c7ae2 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.