From: Aaron Rosen Date: Wed, 7 Aug 2013 18:34:46 +0000 (-0700) Subject: Correct NVP license header files X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9aeb5c2b57c20b751b0197954f334bc15948cb6e;p=openstack-build%2Fneutron-build.git Correct NVP license header files Note: Pointed out by Akihiro but pushed by me as I was the one who push these files originally so I have to change the license. Fixes bug: 1209359 Change-Id: I57d0fc588983e1934ad9321d54e642b72bdbdc9c --- diff --git a/neutron/plugins/nicira/check_nvp_config.py b/neutron/plugins/nicira/check_nvp_config.py index ef8d2609b..c33ef1af4 100644 --- a/neutron/plugins/nicira/check_nvp_config.py +++ b/neutron/plugins/nicira/check_nvp_config.py @@ -9,7 +9,7 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless equired by applicable law or agreed to in writing, software +# Unless required by applicable law or agreed to in writing, software # 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 diff --git a/neutron/plugins/nicira/common/metadata_access.py b/neutron/plugins/nicira/common/metadata_access.py index e54434bdf..bd5a0191b 100644 --- a/neutron/plugins/nicira/common/metadata_access.py +++ b/neutron/plugins/nicira/common/metadata_access.py @@ -9,7 +9,7 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless equired by applicable law or agreed to in writing, software +# Unless required by applicable law or agreed to in writing, software # 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 diff --git a/neutron/plugins/nicira/common/securitygroups.py b/neutron/plugins/nicira/common/securitygroups.py index 2e43c4179..3ca99a9d8 100644 --- a/neutron/plugins/nicira/common/securitygroups.py +++ b/neutron/plugins/nicira/common/securitygroups.py @@ -9,7 +9,7 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless equired by applicable law or agreed to in writing, software +# Unless required by applicable law or agreed to in writing, software # 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 diff --git a/neutron/tests/unit/nicira/test_nvp_api_common.py b/neutron/tests/unit/nicira/test_nvp_api_common.py index a03776e24..2943b7fa1 100644 --- a/neutron/tests/unit/nicira/test_nvp_api_common.py +++ b/neutron/tests/unit/nicira/test_nvp_api_common.py @@ -1,9 +1,19 @@ -# Copyright (C) 2009-2011 Nicira Networks, Inc. All Rights Reserved. +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 Nicira, Inc. +# All Rights Reserved +# +# 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 # -# This software is provided only under the terms and conditions of a written -# license agreement with Nicira. If no such agreement applies to you, you are -# not authorized to use this software. Contact Nicira to obtain an appropriate -# license: www.nicira.com. +# Unless required by applicable law or agreed to in writing, software +# 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. # System import httplib diff --git a/neutron/tests/unit/nicira/test_nvp_api_request.py b/neutron/tests/unit/nicira/test_nvp_api_request.py index 2a13d3b5b..5687f7988 100644 --- a/neutron/tests/unit/nicira/test_nvp_api_request.py +++ b/neutron/tests/unit/nicira/test_nvp_api_request.py @@ -1,9 +1,19 @@ -# Copyright (C) 2009-2011 Nicira Networks, Inc. All Rights Reserved. +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 Nicira, Inc. +# All Rights Reserved +# +# 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 # -# This software is provided only under the terms and conditions of a written -# license agreement with Nicira. If no such agreement applies to you, you are -# not authorized to use this software. Contact Nicira to obtain an appropriate -# license: www.nicira.com. +# Unless required by applicable law or agreed to in writing, software +# 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 eventlet eventlet.monkey_patch()