From 3f01c38822335b278cd1a435e51cf465c11ee518 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 25 Jun 2013 11:19:52 +0200 Subject: [PATCH] Fix up trivial License Header mismatches Newer Hacking version from git have a check for Apache2 license at the beginning of source files. A couple of the files here had trivial mismatches, so fix them up accordingly. Change-Id: I35df87b464b31ae3502a5a028a5c67e6c8af8fd2 --- reddwarf/tests/unittests/guestagent/test_backups.py | 2 +- trove/common/models.py | 2 +- trove/common/remote.py | 2 +- trove/common/views.py | 2 +- trove/dns/models.py | 2 +- trove/extensions/account/models.py | 2 +- trove/extensions/mgmt/host/models.py | 2 +- trove/extensions/mgmt/volume/models.py | 2 +- trove/extensions/mysql/models.py | 2 +- trove/flavor/models.py | 2 +- trove/flavor/service.py | 2 +- trove/flavor/views.py | 2 +- trove/instance/models.py | 2 +- trove/tests/fakes/common.py | 2 +- trove/tests/fakes/guestagent.py | 2 +- trove/tests/fakes/keystone.py | 2 +- trove/tests/fakes/nova.py | 2 +- trove/tests/unittests/guestagent/test_api.py | 2 +- trove/tests/unittests/guestagent/test_dbmodels.py | 2 +- trove/tests/unittests/guestagent/test_manager.py | 2 +- trove/tests/unittests/guestagent/test_models.py | 2 +- trove/tests/unittests/guestagent/test_query.py | 2 +- trove/tests/unittests/guestagent/test_service.py | 2 +- trove/tests/unittests/guestagent/test_volume.py | 2 +- trove/tests/unittests/taskmanager/test_models.py | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/reddwarf/tests/unittests/guestagent/test_backups.py b/reddwarf/tests/unittests/guestagent/test_backups.py index 40910777eb..478872e783 100644 --- a/reddwarf/tests/unittests/guestagent/test_backups.py +++ b/reddwarf/tests/unittests/guestagent/test_backups.py @@ -10,7 +10,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 +# under the License. import reddwarf.guestagent.strategies.backup.base as backupBase import reddwarf.guestagent.strategies.restore.base as restoreBase diff --git a/trove/common/models.py b/trove/common/models.py index 47bbbbed1c..84bff2e893 100644 --- a/trove/common/models.py +++ b/trove/common/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/common/remote.py b/trove/common/remote.py index afaa383320..972a9e9398 100644 --- a/trove/common/remote.py +++ b/trove/common/remote.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/common/views.py b/trove/common/views.py index be98d4b241..b00b607adb 100644 --- a/trove/common/views.py +++ b/trove/common/views.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/dns/models.py b/trove/dns/models.py index 331a2ebe3f..967eae4fa5 100644 --- a/trove/dns/models.py +++ b/trove/dns/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/extensions/account/models.py b/trove/extensions/account/models.py index 46b660976f..0eb6afca72 100644 --- a/trove/extensions/account/models.py +++ b/trove/extensions/account/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/extensions/mgmt/host/models.py b/trove/extensions/mgmt/host/models.py index 9794acf0a2..2eb558be7d 100644 --- a/trove/extensions/mgmt/host/models.py +++ b/trove/extensions/mgmt/host/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/extensions/mgmt/volume/models.py b/trove/extensions/mgmt/volume/models.py index cd202ddf87..34f5a568c9 100644 --- a/trove/extensions/mgmt/volume/models.py +++ b/trove/extensions/mgmt/volume/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/extensions/mysql/models.py b/trove/extensions/mysql/models.py index 368be54ba5..b040bf38ed 100644 --- a/trove/extensions/mysql/models.py +++ b/trove/extensions/mysql/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/flavor/models.py b/trove/flavor/models.py index 289c4454a8..79e3beeec1 100644 --- a/trove/flavor/models.py +++ b/trove/flavor/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/flavor/service.py b/trove/flavor/service.py index 8c1aa19f57..039effee56 100644 --- a/trove/flavor/service.py +++ b/trove/flavor/service.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/flavor/views.py b/trove/flavor/views.py index bbe8ad8076..3cabaa1a4c 100644 --- a/trove/flavor/views.py +++ b/trove/flavor/views.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/instance/models.py b/trove/instance/models.py index 191d77d574..0f5f8a61e4 100644 --- a/trove/instance/models.py +++ b/trove/instance/models.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/tests/fakes/common.py b/trove/tests/fakes/common.py index b814a3b857..8b057a679b 100644 --- a/trove/tests/fakes/common.py +++ b/trove/tests/fakes/common.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/tests/fakes/guestagent.py b/trove/tests/fakes/guestagent.py index e8f4cb2632..9c7ab355c9 100644 --- a/trove/tests/fakes/guestagent.py +++ b/trove/tests/fakes/guestagent.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/tests/fakes/keystone.py b/trove/tests/fakes/keystone.py index a9adc8856c..d75aad5773 100644 --- a/trove/tests/fakes/keystone.py +++ b/trove/tests/fakes/keystone.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/tests/fakes/nova.py b/trove/tests/fakes/nova.py index c808a95aa1..e719781464 100644 --- a/trove/tests/fakes/nova.py +++ b/trove/tests/fakes/nova.py @@ -7,7 +7,7 @@ # 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 +# 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 diff --git a/trove/tests/unittests/guestagent/test_api.py b/trove/tests/unittests/guestagent/test_api.py index 387f1dbd79..8a21d998ef 100644 --- a/trove/tests/unittests/guestagent/test_api.py +++ b/trove/tests/unittests/guestagent/test_api.py @@ -10,7 +10,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 +# under the License. from mockito import when from mockito import any from mockito import verify diff --git a/trove/tests/unittests/guestagent/test_dbmodels.py b/trove/tests/unittests/guestagent/test_dbmodels.py index 8b1dd69632..826e3866b1 100644 --- a/trove/tests/unittests/guestagent/test_dbmodels.py +++ b/trove/tests/unittests/guestagent/test_dbmodels.py @@ -10,7 +10,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 +# under the License. import testtools from trove.guestagent.db import models as dbmodels from mock import Mock, MagicMock diff --git a/trove/tests/unittests/guestagent/test_manager.py b/trove/tests/unittests/guestagent/test_manager.py index c5b38f7434..b2045aa5aa 100644 --- a/trove/tests/unittests/guestagent/test_manager.py +++ b/trove/tests/unittests/guestagent/test_manager.py @@ -10,7 +10,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 +# under the License. from trove.guestagent import volume import testtools diff --git a/trove/tests/unittests/guestagent/test_models.py b/trove/tests/unittests/guestagent/test_models.py index 9eca7c6661..bd1178660f 100644 --- a/trove/tests/unittests/guestagent/test_models.py +++ b/trove/tests/unittests/guestagent/test_models.py @@ -10,7 +10,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 +# under the License. import testtools from mock import Mock, MagicMock diff --git a/trove/tests/unittests/guestagent/test_query.py b/trove/tests/unittests/guestagent/test_query.py index 33cc894805..ab787d3f59 100644 --- a/trove/tests/unittests/guestagent/test_query.py +++ b/trove/tests/unittests/guestagent/test_query.py @@ -10,7 +10,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 +# under the License. import testtools from trove.guestagent import query diff --git a/trove/tests/unittests/guestagent/test_service.py b/trove/tests/unittests/guestagent/test_service.py index 4d46e1239b..4330bac16e 100644 --- a/trove/tests/unittests/guestagent/test_service.py +++ b/trove/tests/unittests/guestagent/test_service.py @@ -10,7 +10,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 +# under the License. import testtools from mock import Mock, MagicMock diff --git a/trove/tests/unittests/guestagent/test_volume.py b/trove/tests/unittests/guestagent/test_volume.py index 98da4d7ef1..83e9fe61bb 100644 --- a/trove/tests/unittests/guestagent/test_volume.py +++ b/trove/tests/unittests/guestagent/test_volume.py @@ -10,7 +10,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 +# under the License. import os import testtools import pexpect diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py index 750365e9da..849df25f3f 100644 --- a/trove/tests/unittests/taskmanager/test_models.py +++ b/trove/tests/unittests/taskmanager/test_models.py @@ -10,7 +10,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 +# under the License. import trove.common.remote as remote import testtools