summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-03 02:06:52 +0000
committerGerrit Code Review <review@openstack.org>2013-04-03 02:06:52 +0000
commit49153d44ca6620a5027b56036e4077725aa90faf (patch)
treeb549009adfa9b81abdb8ea6ad5ae878a172ea629
parentfcf2fdff0a9a70b4cf21c500cf704667c649a04f (diff)
parentb0b37ceaa8aa1aa79bb576ad53c808f74347f5ab (diff)
downloadoslo-49153d44ca6620a5027b56036e4077725aa90faf.tar.gz
oslo-49153d44ca6620a5027b56036e4077725aa90faf.tar.xz
oslo-49153d44ca6620a5027b56036e4077725aa90faf.zip
Merge "Fix IBM copyright strings"
-rw-r--r--openstack/common/sslutils.py2
-rw-r--r--openstack/common/xmlutils.py2
-rw-r--r--tests/unit/fake/__init__.py2
-rw-r--r--tests/unit/test_xmlutils.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/sslutils.py b/openstack/common/sslutils.py
index 73fd641..252da72 100644
--- a/openstack/common/sslutils.py
+++ b/openstack/common/sslutils.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# 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/openstack/common/xmlutils.py b/openstack/common/xmlutils.py
index 3370048..b131d3e 100644
--- a/openstack/common/xmlutils.py
+++ b/openstack/common/xmlutils.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# 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/unit/fake/__init__.py b/tests/unit/fake/__init__.py
index 4941366..9fccd51 100644
--- a/tests/unit/fake/__init__.py
+++ b/tests/unit/fake/__init__.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 IBM
+# Copyright 2012 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/unit/test_xmlutils.py b/tests/unit/test_xmlutils.py
index 86fa69f..5d2bd05 100644
--- a/tests/unit/test_xmlutils.py
+++ b/tests/unit/test_xmlutils.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# 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