summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-02 17:06:03 +0000
committerGerrit Code Review <review@openstack.org>2013-04-02 17:06:03 +0000
commita2fe23613e2286f71f5b5cc2ee726ed326eed998 (patch)
tree8363d9403369f6cecce8285149bce13aba498cbe
parentdd8f22be54b19f469b41d5ff47341e5d0bf7b4e8 (diff)
parentc5a94a4c9adb79e578e1edf792461226b11a392d (diff)
Merge "Fix IBM copyright strings"
-rw-r--r--keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py2
-rw-r--r--tests/test_v3_protection.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py
index c64e25a3..618c738b 100644
--- a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py
+++ b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 OpenStack LLC
-# Copyright 2013 IBM
+# Copyright 2013 IBM Corp.
#
# 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/test_v3_protection.py b/tests/test_v3_protection.py
index c68a2037..ea38b24c 100644
--- a/tests/test_v3_protection.py
+++ b/tests/test_v3_protection.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 OpenStack LLC
-# Copyright 2013 IBM
+# Copyright 2013 IBM Corp.
#
# 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