From af4d4ed4f75ac26339399c2c226cec69eb20caa8 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Tue, 22 Oct 2013 17:46:41 +0000 Subject: [PATCH] Fixing copyright and license headers * Added HP copyrights as appropriate Change-Id: If4f30b0caf03b16f5fb4f54185ba80d9fa41d0b0 --- troveclient/__init__.py | 4 +++- troveclient/base.py | 4 +++- troveclient/client.py | 6 +++++- troveclient/common.py | 6 +++++- troveclient/exceptions.py | 7 ++++++- troveclient/service_catalog.py | 4 +++- troveclient/shell.py | 5 ++++- troveclient/tests/__init__.py | 17 +++++++++++++++++ troveclient/tests/test_accounts.py | 19 +++++++++++++++++++ troveclient/tests/test_auth.py | 18 ++++++++++++++++++ troveclient/tests/test_base.py | 19 +++++++++++++++++++ troveclient/tests/test_client.py | 26 ++++++++++++++++---------- troveclient/tests/test_common.py | 19 +++++++++++++++++++ troveclient/tests/test_instances.py | 19 +++++++++++++++++++ troveclient/tests/test_limits.py | 19 +++++++++++++++++++ troveclient/tests/test_management.py | 19 +++++++++++++++++++ troveclient/tests/test_secgroups.py | 19 +++++++++++++++++++ troveclient/tests/test_users.py | 19 +++++++++++++++++++ troveclient/tests/test_utils.py | 19 +++++++++++++++++++ troveclient/utils.py | 6 +++++- troveclient/v1/__init__.py | 17 +++++++++++++++++ troveclient/v1/accounts.py | 5 ++++- troveclient/v1/backups.py | 6 +++++- troveclient/v1/client.py | 18 ++++++++++++++++++ troveclient/v1/databases.py | 18 ++++++++++++++++++ troveclient/v1/diagnostics.py | 5 ++++- troveclient/v1/flavors.py | 6 ++++-- troveclient/v1/hosts.py | 5 ++++- troveclient/v1/instances.py | 6 +++++- troveclient/v1/limits.py | 6 +++++- troveclient/v1/management.py | 5 ++++- troveclient/v1/quota.py | 6 +++++- troveclient/v1/root.py | 5 ++++- troveclient/v1/security_groups.py | 5 ++++- troveclient/v1/shell.py | 18 ++++++++++++++++++ troveclient/v1/storage.py | 5 ++++- troveclient/v1/users.py | 5 ++++- 37 files changed, 383 insertions(+), 32 deletions(-) diff --git a/troveclient/__init__.py b/troveclient/__init__.py index 8efe8477..4ed87918 100644 --- a/troveclient/__init__.py +++ b/troveclient/__init__.py @@ -1,6 +1,8 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright 2012 OpenStack LLC +# Copyright 2012 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 diff --git a/troveclient/base.py b/troveclient/base.py index 44ac425d..7f4adef7 100644 --- a/troveclient/base.py +++ b/troveclient/base.py @@ -1,6 +1,8 @@ -# Copyright 2010 Jacob Kaplan-Moss +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# Copyright 2010 Jacob Kaplan-Moss # Copyright 2012 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/client.py b/troveclient/client.py index 14ec959f..af9362eb 100644 --- a/troveclient/client.py +++ b/troveclient/client.py @@ -1,4 +1,8 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/common.py b/troveclient/common.py index 4cba2892..b2befd31 100644 --- a/troveclient/common.py +++ b/troveclient/common.py @@ -1,4 +1,8 @@ -# Copyright 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 diff --git a/troveclient/exceptions.py b/troveclient/exceptions.py index 7808a327..23db77ee 100644 --- a/troveclient/exceptions.py +++ b/troveclient/exceptions.py @@ -1,4 +1,9 @@ -# Copyright 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 diff --git a/troveclient/service_catalog.py b/troveclient/service_catalog.py index a5431429..9cde7ffc 100644 --- a/troveclient/service_catalog.py +++ b/troveclient/service_catalog.py @@ -1,6 +1,8 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + # Copyright 2011 OpenStack LLC. # Copyright 2011, Piston Cloud Computing, Inc. -# +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/troveclient/shell.py b/troveclient/shell.py index 27fe0c85..adca7301 100644 --- a/troveclient/shell.py +++ b/troveclient/shell.py @@ -1,4 +1,7 @@ -# Copyright 2011 OpenStack LLC. +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/tests/__init__.py b/troveclient/tests/__init__.py index e69de29b..adfbb693 100644 --- a/troveclient/tests/__init__.py +++ b/troveclient/tests/__init__.py @@ -0,0 +1,17 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. diff --git a/troveclient/tests/test_accounts.py b/troveclient/tests/test_accounts.py index 1b5a1f45..d541e985 100644 --- a/troveclient/tests/test_accounts.py +++ b/troveclient/tests/test_accounts.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock diff --git a/troveclient/tests/test_auth.py b/troveclient/tests/test_auth.py index 4c1023d1..f57f8ea9 100644 --- a/troveclient/tests/test_auth.py +++ b/troveclient/tests/test_auth.py @@ -1,3 +1,21 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. from testtools import TestCase from troveclient import auth diff --git a/troveclient/tests/test_base.py b/troveclient/tests/test_base.py index 6d4e9eb5..64147538 100644 --- a/troveclient/tests/test_base.py +++ b/troveclient/tests/test_base.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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 contextlib import os diff --git a/troveclient/tests/test_client.py b/troveclient/tests/test_client.py index 84c332ad..5ae65376 100644 --- a/troveclient/tests/test_client.py +++ b/troveclient/tests/test_client.py @@ -1,15 +1,21 @@ -# 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 +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# All Rights Reserved. # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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 # -# 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. +# 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 +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. from testtools import TestCase diff --git a/troveclient/tests/test_common.py b/troveclient/tests/test_common.py index c0d8090f..320e4ce2 100644 --- a/troveclient/tests/test_common.py +++ b/troveclient/tests/test_common.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock diff --git a/troveclient/tests/test_instances.py b/troveclient/tests/test_instances.py index b3a2a002..2b74052c 100644 --- a/troveclient/tests/test_instances.py +++ b/troveclient/tests/test_instances.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock diff --git a/troveclient/tests/test_limits.py b/troveclient/tests/test_limits.py index 8b9087dc..2a7230a9 100644 --- a/troveclient/tests/test_limits.py +++ b/troveclient/tests/test_limits.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock from troveclient.v1 import limits diff --git a/troveclient/tests/test_management.py b/troveclient/tests/test_management.py index 0b377494..60c7825e 100644 --- a/troveclient/tests/test_management.py +++ b/troveclient/tests/test_management.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock diff --git a/troveclient/tests/test_secgroups.py b/troveclient/tests/test_secgroups.py index 1d4d355d..20ab13bc 100644 --- a/troveclient/tests/test_secgroups.py +++ b/troveclient/tests/test_secgroups.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock diff --git a/troveclient/tests/test_users.py b/troveclient/tests/test_users.py index 5f04d380..01290e27 100644 --- a/troveclient/tests/test_users.py +++ b/troveclient/tests/test_users.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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. + from testtools import TestCase from mock import Mock diff --git a/troveclient/tests/test_utils.py b/troveclient/tests/test_utils.py index 217b5966..22dc670e 100644 --- a/troveclient/tests/test_utils.py +++ b/troveclient/tests/test_utils.py @@ -1,3 +1,22 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# 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 +# +# 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 os from testtools import TestCase from troveclient import utils diff --git a/troveclient/utils.py b/troveclient/utils.py index 0cb9d49e..d3423c2b 100644 --- a/troveclient/utils.py +++ b/troveclient/utils.py @@ -1,4 +1,8 @@ -# Copyright 2012 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 diff --git a/troveclient/v1/__init__.py b/troveclient/v1/__init__.py index e69de29b..0685d8a4 100644 --- a/troveclient/v1/__init__.py +++ b/troveclient/v1/__init__.py @@ -0,0 +1,17 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 +# +# 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. diff --git a/troveclient/v1/accounts.py b/troveclient/v1/accounts.py index 7e5a48ed..7d9bf07f 100644 --- a/troveclient/v1/accounts.py +++ b/troveclient/v1/accounts.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/backups.py b/troveclient/v1/backups.py index 85b79f7f..0c72a877 100644 --- a/troveclient/v1/backups.py +++ b/troveclient/v1/backups.py @@ -1,4 +1,8 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/client.py b/troveclient/v1/client.py index 0b80e211..d48f714e 100644 --- a/troveclient/v1/client.py +++ b/troveclient/v1/client.py @@ -1,3 +1,21 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 +# +# 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. + from troveclient import client from troveclient.v1.databases import Databases from troveclient.v1.flavors import Flavors diff --git a/troveclient/v1/databases.py b/troveclient/v1/databases.py index 20f3cd53..91720838 100644 --- a/troveclient/v1/databases.py +++ b/troveclient/v1/databases.py @@ -1,3 +1,21 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 +# +# 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. + from troveclient import base from troveclient.common import check_for_exceptions from troveclient.common import limit_url diff --git a/troveclient/v1/diagnostics.py b/troveclient/v1/diagnostics.py index 64295808..bf067db6 100644 --- a/troveclient/v1/diagnostics.py +++ b/troveclient/v1/diagnostics.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/flavors.py b/troveclient/v1/flavors.py index 1bb49d9c..cd70ec8c 100644 --- a/troveclient/v1/flavors.py +++ b/troveclient/v1/flavors.py @@ -1,4 +1,7 @@ -# Copyright (c) 2012 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -13,7 +16,6 @@ # License for the specific language governing permissions and limitations # under the License. - from troveclient import base diff --git a/troveclient/v1/hosts.py b/troveclient/v1/hosts.py index d42f6880..8a3e5832 100644 --- a/troveclient/v1/hosts.py +++ b/troveclient/v1/hosts.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/instances.py b/troveclient/v1/instances.py index 3b12f023..7dee8c03 100644 --- a/troveclient/v1/instances.py +++ b/troveclient/v1/instances.py @@ -1,4 +1,8 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/limits.py b/troveclient/v1/limits.py index 88de1a0e..35733e97 100644 --- a/troveclient/v1/limits.py +++ b/troveclient/v1/limits.py @@ -1,4 +1,8 @@ -# Copyright (c) 2013 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/management.py b/troveclient/v1/management.py index 0aabe21e..a3d11582 100644 --- a/troveclient/v1/management.py +++ b/troveclient/v1/management.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/quota.py b/troveclient/v1/quota.py index fdf27d39..b076e64a 100644 --- a/troveclient/v1/quota.py +++ b/troveclient/v1/quota.py @@ -1,4 +1,8 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/root.py b/troveclient/v1/root.py index 247332b3..8e66bed2 100644 --- a/troveclient/v1/root.py +++ b/troveclient/v1/root.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/security_groups.py b/troveclient/v1/security_groups.py index 5edda16d..ee62b0f6 100644 --- a/troveclient/v1/security_groups.py +++ b/troveclient/v1/security_groups.py @@ -1,4 +1,8 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -12,7 +16,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# from troveclient import base diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py index 835dd451..299431cf 100644 --- a/troveclient/v1/shell.py +++ b/troveclient/v1/shell.py @@ -1,3 +1,21 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting +# 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 +# +# 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. + from __future__ import print_function import sys diff --git a/troveclient/v1/storage.py b/troveclient/v1/storage.py index 72424c50..95cd480d 100644 --- a/troveclient/v1/storage.py +++ b/troveclient/v1/storage.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/troveclient/v1/users.py b/troveclient/v1/users.py index f04ca34a..3e8586dd 100644 --- a/troveclient/v1/users.py +++ b/troveclient/v1/users.py @@ -1,4 +1,7 @@ -# Copyright (c) 2011 OpenStack Foundation +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack Foundation +# Copyright 2013 Rackspace Hosting # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may