diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-04 07:53:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-04 07:53:42 +0000 |
| commit | bb6ebd488f3407020df48e91e7a3b589b3a2fca8 (patch) | |
| tree | c9fa5bb58ca79da1cadd305dca10dd94f931105d | |
| parent | 62d948a66b27ad2622a324bd9a070346f7b607d2 (diff) | |
| parent | e5bdb3d0df80b4de9274dd227a954b24abc7f946 (diff) | |
| download | keystone-bb6ebd488f3407020df48e91e7a3b589b3a2fca8.tar.gz keystone-bb6ebd488f3407020df48e91e7a3b589b3a2fca8.tar.xz keystone-bb6ebd488f3407020df48e91e7a3b589b3a2fca8.zip | |
Merge "Fix up some trivial license mismatches"
| -rw-r--r-- | keystone/common/openssl.py | 1 | ||||
| -rw-r--r-- | tests/test_migrate_nova_auth.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keystone/common/openssl.py b/keystone/common/openssl.py index 427202ae..fa09e37c 100644 --- a/keystone/common/openssl.py +++ b/keystone/common/openssl.py @@ -12,6 +12,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations +# under the License. # import os diff --git a/tests/test_migrate_nova_auth.py b/tests/test_migrate_nova_auth.py index 3a122940..bd25b18e 100644 --- a/tests/test_migrate_nova_auth.py +++ b/tests/test_migrate_nova_auth.py @@ -2,14 +2,14 @@ # Copyright 2012 OpenStack LLC # -# Licensed under the Apache License, Version 2.0 (the 'License'); you may +# Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. |