diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-05 16:54:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-05 16:54:16 +0000 |
| commit | 60caa26e1d9af78931402d9bcb3bcf6dcbe88ebc (patch) | |
| tree | 4b08e078578be27ea64317811faa828b24c18d51 | |
| parent | ce590cc844abebd5110661e18a748041b3646e94 (diff) | |
| parent | 97135cbfc03eb069438eb5b8858edaea061aa030 (diff) | |
| download | heat-60caa26e1d9af78931402d9bcb3bcf6dcbe88ebc.tar.gz | |
Merge "Remove vim header from files."
239 files changed, 0 insertions, 239 deletions
diff --git a/bin/heat-api b/bin/heat-api index 3bfa8e757..3d9bcc85e 100755 --- a/bin/heat-api +++ b/bin/heat-api @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/bin/heat-api-cfn b/bin/heat-api-cfn index 8d0371c3e..a5e753aec 100755 --- a/bin/heat-api-cfn +++ b/bin/heat-api-cfn @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch index 76f123cf5..803cffe47 100755 --- a/bin/heat-api-cloudwatch +++ b/bin/heat-api-cloudwatch @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/bin/heat-engine b/bin/heat-engine index c25ec5d26..14ef7ce06 100755 --- a/bin/heat-engine +++ b/bin/heat-engine @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/bin/heat-manage b/bin/heat-manage index 32bdc8f78..83d9de774 100755 --- a/bin/heat-manage +++ b/bin/heat-manage @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/contrib/docker/docker/resources/docker_container.py b/contrib/docker/docker/resources/docker_container.py index 094c6ac72..de5ceefb6 100644 --- a/contrib/docker/docker/resources/docker_container.py +++ b/contrib/docker/docker/resources/docker_container.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Copyright (c) 2013 Docker, Inc. # All Rights Reserved. diff --git a/contrib/docker/docker/tests/fake_docker_client.py b/contrib/docker/docker/tests/fake_docker_client.py index cd4064819..291a25cd6 100644 --- a/contrib/docker/docker/tests/fake_docker_client.py +++ b/contrib/docker/docker/tests/fake_docker_client.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Copyright (c) 2013 Docker, Inc. # All Rights Reserved. diff --git a/contrib/docker/docker/tests/test_docker_container.py b/contrib/docker/docker/tests/test_docker_container.py index 40eb8c2dc..4f69904df 100644 --- a/contrib/docker/docker/tests/test_docker_container.py +++ b/contrib/docker/docker/tests/test_docker_container.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Copyright (c) 2013 Docker, Inc. # All Rights Reserved. diff --git a/contrib/rackspace/rackspace/clients.py b/contrib/rackspace/rackspace/clients.py index 063ab8a74..3dfe06210 100644 --- a/contrib/rackspace/rackspace/clients.py +++ b/contrib/rackspace/rackspace/clients.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/contrib/rackspace/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py index 6f3fc727d..165ac9ff3 100644 --- a/contrib/rackspace/rackspace/resources/auto_scale.py +++ b/contrib/rackspace/rackspace/resources/auto_scale.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py b/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py index 780ed3754..6f0ad45ff 100644 --- a/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py +++ b/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/contrib/rackspace/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py index d1e6f986f..aa387d334 100644 --- a/contrib/rackspace/rackspace/tests/test_auto_scale.py +++ b/contrib/rackspace/rackspace/tests/test_auto_scale.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py index 582a6b727..f7a522f38 100644 --- a/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py +++ b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/contrib/rackspace/rackspace/tests/test_rackspace_clients.py b/contrib/rackspace/rackspace/tests/test_rackspace_clients.py index 606da7865..a09b5538e 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_clients.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_clients.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/doc/source/ext/resources.py b/doc/source/ext/resources.py index c7cc3cc49..8c35d93ec 100644 --- a/doc/source/ext/resources.py +++ b/doc/source/ext/resources.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/__init__.py b/heat/__init__.py index 57e2d0f65..2e9772bc7 100644 --- a/heat/__init__.py +++ b/heat/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py index 8ca4d44d3..f524cb4a2 100644 --- a/heat/api/aws/ec2token.py +++ b/heat/api/aws/ec2token.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/aws/exception.py b/heat/api/aws/exception.py index 9177e254b..7f5140875 100644 --- a/heat/api/aws/exception.py +++ b/heat/api/aws/exception.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/heat/api/aws/utils.py b/heat/api/aws/utils.py index f11966e1a..530abfa2e 100644 --- a/heat/api/aws/utils.py +++ b/heat/api/aws/utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cfn/__init__.py b/heat/api/cfn/__init__.py index b7e12f743..f298e8ab8 100644 --- a/heat/api/cfn/__init__.py +++ b/heat/api/cfn/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cfn/v1/__init__.py b/heat/api/cfn/v1/__init__.py index d00d7f130..0ff0c5a4f 100644 --- a/heat/api/cfn/v1/__init__.py +++ b/heat/api/cfn/v1/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cfn/v1/signal.py b/heat/api/cfn/v1/signal.py index 119fcfa53..abfbbf416 100644 --- a/heat/api/cfn/v1/signal.py +++ b/heat/api/cfn/v1/signal.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 3f74d4771..484170a66 100644 --- a/heat/api/cfn/v1/stacks.py +++ b/heat/api/cfn/v1/stacks.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cfn/versions.py b/heat/api/cfn/versions.py index a6407d4e2..722a79b34 100644 --- a/heat/api/cfn/versions.py +++ b/heat/api/cfn/versions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cloudwatch/__init__.py b/heat/api/cloudwatch/__init__.py index a49db0df8..bb3f9f910 100644 --- a/heat/api/cloudwatch/__init__.py +++ b/heat/api/cloudwatch/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cloudwatch/versions.py b/heat/api/cloudwatch/versions.py index a6407d4e2..722a79b34 100644 --- a/heat/api/cloudwatch/versions.py +++ b/heat/api/cloudwatch/versions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py index 093a9f585..ec4f3b24f 100644 --- a/heat/api/cloudwatch/watch.py +++ b/heat/api/cloudwatch/watch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/middleware/version_negotiation.py b/heat/api/middleware/version_negotiation.py index 7063cd71a..491a3331b 100644 --- a/heat/api/middleware/version_negotiation.py +++ b/heat/api/middleware/version_negotiation.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/__init__.py b/heat/api/openstack/__init__.py index 5d3de3040..081cedf99 100644 --- a/heat/api/openstack/__init__.py +++ b/heat/api/openstack/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/__init__.py b/heat/api/openstack/v1/__init__.py index e500e885d..b30346410 100644 --- a/heat/api/openstack/v1/__init__.py +++ b/heat/api/openstack/v1/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/actions.py b/heat/api/openstack/v1/actions.py index 978654929..23ad9e0c3 100644 --- a/heat/api/openstack/v1/actions.py +++ b/heat/api/openstack/v1/actions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/build_info.py b/heat/api/openstack/v1/build_info.py index 366064479..ac2c05245 100644 --- a/heat/api/openstack/v1/build_info.py +++ b/heat/api/openstack/v1/build_info.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/events.py b/heat/api/openstack/v1/events.py index 0d387d3bc..da3cdb1f6 100644 --- a/heat/api/openstack/v1/events.py +++ b/heat/api/openstack/v1/events.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/resources.py b/heat/api/openstack/v1/resources.py index 9601028b9..cbe40289b 100644 --- a/heat/api/openstack/v1/resources.py +++ b/heat/api/openstack/v1/resources.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/software_configs.py b/heat/api/openstack/v1/software_configs.py index 5d9ddeae2..e015c1578 100644 --- a/heat/api/openstack/v1/software_configs.py +++ b/heat/api/openstack/v1/software_configs.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/software_deployments.py b/heat/api/openstack/v1/software_deployments.py index ace417cc5..a770e4f1f 100644 --- a/heat/api/openstack/v1/software_deployments.py +++ b/heat/api/openstack/v1/software_deployments.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/stacks.py b/heat/api/openstack/v1/stacks.py index 99b001a73..280a1941f 100644 --- a/heat/api/openstack/v1/stacks.py +++ b/heat/api/openstack/v1/stacks.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/util.py b/heat/api/openstack/v1/util.py index 23976a0dc..081450951 100644 --- a/heat/api/openstack/v1/util.py +++ b/heat/api/openstack/v1/util.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/views/stacks_view.py b/heat/api/openstack/v1/views/stacks_view.py index 7a11fc7f3..3a494a709 100644 --- a/heat/api/openstack/v1/views/stacks_view.py +++ b/heat/api/openstack/v1/views/stacks_view.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/v1/views/views_common.py b/heat/api/openstack/v1/views/views_common.py index 67524ef9d..ab0bb037d 100644 --- a/heat/api/openstack/v1/views/views_common.py +++ b/heat/api/openstack/v1/views/views_common.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/api/openstack/versions.py b/heat/api/openstack/versions.py index a6407d4e2..722a79b34 100644 --- a/heat/api/openstack/versions.py +++ b/heat/api/openstack/versions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/cmd/manage.py b/heat/cmd/manage.py index 06bd2da45..5f2d3e64a 100644 --- a/heat/cmd/manage.py +++ b/heat/cmd/manage.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # All Rights Reserved. # diff --git a/heat/common/auth_password.py b/heat/common/auth_password.py index 8f512ab89..723fcfc1a 100644 --- a/heat/common/auth_password.py +++ b/heat/common/auth_password.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 OpenStack Foundation # diff --git a/heat/common/config.py b/heat/common/config.py index 5b338cda8..ddfc42cd9 100644 --- a/heat/common/config.py +++ b/heat/common/config.py @@ -1,5 +1,4 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/context.py b/heat/common/context.py index 564d13b83..8a82afa62 100644 --- a/heat/common/context.py +++ b/heat/common/context.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/crypt.py b/heat/common/crypt.py index 3996a78a0..c87678f93 100644 --- a/heat/common/crypt.py +++ b/heat/common/crypt.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/custom_backend_auth.py b/heat/common/custom_backend_auth.py index 4ad416077..d57de40fc 100644 --- a/heat/common/custom_backend_auth.py +++ b/heat/common/custom_backend_auth.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (C) 2012, Red Hat, Inc. # diff --git a/heat/common/environment_format.py b/heat/common/environment_format.py index 74d71a138..31786c0e2 100644 --- a/heat/common/environment_format.py +++ b/heat/common/environment_format.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/exception.py b/heat/common/exception.py index b196f6d53..5ede75bd8 100644 --- a/heat/common/exception.py +++ b/heat/common/exception.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py index 01dfb8095..e76406cc5 100644 --- a/heat/common/heat_keystoneclient.py +++ b/heat/common/heat_keystoneclient.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/identifier.py b/heat/common/identifier.py index fda926061..170190dbc 100644 --- a/heat/common/identifier.py +++ b/heat/common/identifier.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/common/plugin_loader.py b/heat/common/plugin_loader.py index b59a7519e..aa45f76bc 100644 --- a/heat/common/plugin_loader.py +++ b/heat/common/plugin_loader.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/policy.py b/heat/common/policy.py index 2bac8e90f..6468742ce 100644 --- a/heat/common/policy.py +++ b/heat/common/policy.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. diff --git a/heat/common/short_id.py b/heat/common/short_id.py index 83c9fcb96..75a500b10 100644 --- a/heat/common/short_id.py +++ b/heat/common/short_id.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/common/template_format.py b/heat/common/template_format.py index 4831fbddc..54e496f86 100644 --- a/heat/common/template_format.py +++ b/heat/common/template_format.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/timeutils.py b/heat/common/timeutils.py index df24de72e..82add4d84 100644 --- a/heat/common/timeutils.py +++ b/heat/common/timeutils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/common/urlfetch.py b/heat/common/urlfetch.py index 6194e5ba9..9892103f1 100644 --- a/heat/common/urlfetch.py +++ b/heat/common/urlfetch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py index 03880b8f1..557224f34 100644 --- a/heat/common/wsgi.py +++ b/heat/common/wsgi.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/heat/db/api.py b/heat/db/api.py index 541bc4eb1..a0623e3e0 100644 --- a/heat/db/api.py +++ b/heat/db/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py index 56ff639cf..9815c12b7 100644 --- a/heat/db/sqlalchemy/api.py +++ b/heat/db/sqlalchemy/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/db/sqlalchemy/filters.py b/heat/db/sqlalchemy/filters.py index 7771c34d1..f91b57e3d 100644 --- a/heat/db/sqlalchemy/filters.py +++ b/heat/db/sqlalchemy/filters.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py b/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py index f475691f1..f2c7925cb 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py b/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py index e3f1a4a6b..3f4905fa9 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py b/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py index 81261406d..602cfd4ad 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py index 2b374d30a..7fc129213 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py index 7b8f70fd6..892bdb4fb 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py index 4d635650d..0da3d2703 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py b/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py index 7fa31afb8..2491ed0d6 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py b/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py index 35a8ca9fe..17e9ba374 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py b/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py index 920f29f33..642b0f9c8 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py b/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py index 3070f887c..24db8e9ea 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py b/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py index 69e7cb992..e67309c06 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py b/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py index bd974968e..c3e73bd4a 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py b/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py index 3a3f80b71..b5870af1d 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py index 9a5424687..7f070e199 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py index 65b933cf4..a7a04a234 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py b/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py index b359ff11c..27901921a 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py b/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py index fbc2ba4f1..e468f767c 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py b/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py index 17722b158..5f39e77ca 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py b/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py index 07408b54b..e0c376156 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py index bbecf8ce1..711191092 100644 --- a/heat/db/sqlalchemy/models.py +++ b/heat/db/sqlalchemy/models.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/db/sqlalchemy/mutable.py b/heat/db/sqlalchemy/mutable.py index 040cc7d07..8646a6240 100644 --- a/heat/db/sqlalchemy/mutable.py +++ b/heat/db/sqlalchemy/mutable.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/db/sync.py b/heat/db/sync.py index 0db39e3c2..6d4013b6e 100755 --- a/heat/db/sync.py +++ b/heat/db/sync.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/db/utils.py b/heat/db/utils.py index 2351d45d0..eb5b8b170 100644 --- a/heat/db/utils.py +++ b/heat/db/utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/api.py b/heat/engine/api.py index e57698bd3..b7d72d80a 100644 --- a/heat/engine/api.py +++ b/heat/engine/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/engine/attributes.py b/heat/engine/attributes.py index a46c91fcc..f4b0a5bbf 100644 --- a/heat/engine/attributes.py +++ b/heat/engine/attributes.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/cfn/functions.py b/heat/engine/cfn/functions.py index 871e26a09..964539436 100644 --- a/heat/engine/cfn/functions.py +++ b/heat/engine/cfn/functions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/clients.py b/heat/engine/clients.py index b7fb29491..7d8448bbb 100644 --- a/heat/engine/clients.py +++ b/heat/engine/clients.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/constraints.py b/heat/engine/constraints.py index 02ef8e17d..61b9c055d 100644 --- a/heat/engine/constraints.py +++ b/heat/engine/constraints.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/dependencies.py b/heat/engine/dependencies.py index 819b4dbe6..bba3c8351 100644 --- a/heat/engine/dependencies.py +++ b/heat/engine/dependencies.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/environment.py b/heat/engine/environment.py index d36285941..2385423a7 100644 --- a/heat/engine/environment.py +++ b/heat/engine/environment.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/event.py b/heat/engine/event.py index 33791b0c7..802400ed2 100644 --- a/heat/engine/event.py +++ b/heat/engine/event.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/function.py b/heat/engine/function.py index 847701f2b..2f48ff2e8 100644 --- a/heat/engine/function.py +++ b/heat/engine/function.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/hot/__init__.py b/heat/engine/hot/__init__.py index de6dae195..1a8dcd460 100644 --- a/heat/engine/hot/__init__.py +++ b/heat/engine/hot/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/engine/hot/functions.py b/heat/engine/hot/functions.py index d6a8c11b8..dba6ca947 100644 --- a/heat/engine/hot/functions.py +++ b/heat/engine/hot/functions.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/engine/parameters.py b/heat/engine/parameters.py index 7d2955cb7..04c99fd6d 100644 --- a/heat/engine/parameters.py +++ b/heat/engine/parameters.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/parser.py b/heat/engine/parser.py index c61f13096..cc05a578d 100644 --- a/heat/engine/parser.py +++ b/heat/engine/parser.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/properties.py b/heat/engine/properties.py index 50d30b263..a77774bec 100644 --- a/heat/engine/properties.py +++ b/heat/engine/properties.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 0edeb887c..9e8fdad9c 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py index b9b88d878..fcb4a3b53 100644 --- a/heat/engine/resources/__init__.py +++ b/heat/engine/resources/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py index ad94fac30..b34a2e0aa 100644 --- a/heat/engine/resources/autoscaling.py +++ b/heat/engine/resources/autoscaling.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/ceilometer/alarm.py b/heat/engine/resources/ceilometer/alarm.py index ca9bfaa5c..a0b92863e 100644 --- a/heat/engine/resources/ceilometer/alarm.py +++ b/heat/engine/resources/ceilometer/alarm.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py index 76d304598..9470625cc 100644 --- a/heat/engine/resources/cloud_watch.py +++ b/heat/engine/resources/cloud_watch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/eip.py b/heat/engine/resources/eip.py index 9f65e2f3e..0808d3698 100644 --- a/heat/engine/resources/eip.py +++ b/heat/engine/resources/eip.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index 999c2d449..88e3f59b7 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/internet_gateway.py b/heat/engine/resources/internet_gateway.py index 17e037760..51d82cbde 100644 --- a/heat/engine/resources/internet_gateway.py +++ b/heat/engine/resources/internet_gateway.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py index 6f39c07b0..14b4c5916 100644 --- a/heat/engine/resources/loadbalancer.py +++ b/heat/engine/resources/loadbalancer.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/network_interface.py b/heat/engine/resources/network_interface.py index ea3bac5b2..4ae63b63f 100644 --- a/heat/engine/resources/network_interface.py +++ b/heat/engine/resources/network_interface.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/firewall.py b/heat/engine/resources/neutron/firewall.py index bb44911f0..a795d79a1 100644 --- a/heat/engine/resources/neutron/firewall.py +++ b/heat/engine/resources/neutron/firewall.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/engine/resources/neutron/floatingip.py b/heat/engine/resources/neutron/floatingip.py index b86e3c47b..b884427ff 100644 --- a/heat/engine/resources/neutron/floatingip.py +++ b/heat/engine/resources/neutron/floatingip.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/loadbalancer.py b/heat/engine/resources/neutron/loadbalancer.py index 3a9228766..dee67d12b 100644 --- a/heat/engine/resources/neutron/loadbalancer.py +++ b/heat/engine/resources/neutron/loadbalancer.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/net.py b/heat/engine/resources/neutron/net.py index 2421bb532..1e34be8d5 100644 --- a/heat/engine/resources/neutron/net.py +++ b/heat/engine/resources/neutron/net.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/network_gateway.py b/heat/engine/resources/neutron/network_gateway.py index 21d067903..9d52af495 100644 --- a/heat/engine/resources/neutron/network_gateway.py +++ b/heat/engine/resources/neutron/network_gateway.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 NTT Corp. # All Rights Reserved. diff --git a/heat/engine/resources/neutron/neutron.py b/heat/engine/resources/neutron/neutron.py index 0948f859e..54a202f10 100644 --- a/heat/engine/resources/neutron/neutron.py +++ b/heat/engine/resources/neutron/neutron.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/port.py b/heat/engine/resources/neutron/port.py index 227165d1a..6a4ae7ba7 100644 --- a/heat/engine/resources/neutron/port.py +++ b/heat/engine/resources/neutron/port.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/router.py b/heat/engine/resources/neutron/router.py index 54b446d45..0b6b4a6d7 100644 --- a/heat/engine/resources/neutron/router.py +++ b/heat/engine/resources/neutron/router.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/security_group.py b/heat/engine/resources/neutron/security_group.py index fd58e1360..adeae2577 100644 --- a/heat/engine/resources/neutron/security_group.py +++ b/heat/engine/resources/neutron/security_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/subnet.py b/heat/engine/resources/neutron/subnet.py index 87ce9e0ff..7561e6827 100644 --- a/heat/engine/resources/neutron/subnet.py +++ b/heat/engine/resources/neutron/subnet.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/neutron/vpnservice.py b/heat/engine/resources/neutron/vpnservice.py index a508b0428..8a9047b58 100644 --- a/heat/engine/resources/neutron/vpnservice.py +++ b/heat/engine/resources/neutron/vpnservice.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/nova_utils.py b/heat/engine/resources/nova_utils.py index 91679532a..f038c1895 100644 --- a/heat/engine/resources/nova_utils.py +++ b/heat/engine/resources/nova_utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/os_database.py b/heat/engine/resources/os_database.py index 7b4192fb3..476962360 100644 --- a/heat/engine/resources/os_database.py +++ b/heat/engine/resources/os_database.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/random_string.py b/heat/engine/resources/random_string.py index 65f381e1a..fc7d2af46 100644 --- a/heat/engine/resources/random_string.py +++ b/heat/engine/resources/random_string.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/resource_group.py b/heat/engine/resources/resource_group.py index 64c68a7f6..edc54092d 100644 --- a/heat/engine/resources/resource_group.py +++ b/heat/engine/resources/resource_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/route_table.py b/heat/engine/resources/route_table.py index 87410e04c..af8c7e2ea 100644 --- a/heat/engine/resources/route_table.py +++ b/heat/engine/resources/route_table.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/s3.py b/heat/engine/resources/s3.py index beb189155..bde3cc7b0 100644 --- a/heat/engine/resources/s3.py +++ b/heat/engine/resources/s3.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py index 52d887d06..6cf369aea 100644 --- a/heat/engine/resources/security_group.py +++ b/heat/engine/resources/security_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/server.py b/heat/engine/resources/server.py index 150d6734a..d281fd424 100644 --- a/heat/engine/resources/server.py +++ b/heat/engine/resources/server.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/software_config/cloud_config.py b/heat/engine/resources/software_config/cloud_config.py index fd431a07c..c3c87ce5d 100644 --- a/heat/engine/resources/software_config/cloud_config.py +++ b/heat/engine/resources/software_config/cloud_config.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/software_config/multi_part.py b/heat/engine/resources/software_config/multi_part.py index 903dfec97..d1bb11a72 100644 --- a/heat/engine/resources/software_config/multi_part.py +++ b/heat/engine/resources/software_config/multi_part.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/software_config/software_config.py b/heat/engine/resources/software_config/software_config.py index 3ecf4b661..fc3ac72be 100644 --- a/heat/engine/resources/software_config/software_config.py +++ b/heat/engine/resources/software_config/software_config.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py index 0564f2862..acc5ce324 100644 --- a/heat/engine/resources/stack.py +++ b/heat/engine/resources/stack.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/subnet.py b/heat/engine/resources/subnet.py index 46ba665b1..1e8e4316c 100644 --- a/heat/engine/resources/subnet.py +++ b/heat/engine/resources/subnet.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/swift.py b/heat/engine/resources/swift.py index 3378dcba5..f5a3e944c 100644 --- a/heat/engine/resources/swift.py +++ b/heat/engine/resources/swift.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/template_resource.py b/heat/engine/resources/template_resource.py index fc7d8f313..8fb6e9427 100644 --- a/heat/engine/resources/template_resource.py +++ b/heat/engine/resources/template_resource.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py index c6c0b895b..7ca6678ee 100644 --- a/heat/engine/resources/user.py +++ b/heat/engine/resources/user.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py index edb010c78..585331380 100644 --- a/heat/engine/resources/volume.py +++ b/heat/engine/resources/volume.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/vpc.py b/heat/engine/resources/vpc.py index e174dcbe4..ee8538b00 100644 --- a/heat/engine/resources/vpc.py +++ b/heat/engine/resources/vpc.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py index d4b932631..ddad74e61 100644 --- a/heat/engine/resources/wait_condition.py +++ b/heat/engine/resources/wait_condition.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/scheduler.py b/heat/engine/scheduler.py index 5b1eaecc4..0bd89e004 100644 --- a/heat/engine/scheduler.py +++ b/heat/engine/scheduler.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/service.py b/heat/engine/service.py index 07827df23..bb8af564a 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/signal_responder.py b/heat/engine/signal_responder.py index 979371dfc..503d9105b 100644 --- a/heat/engine/signal_responder.py +++ b/heat/engine/signal_responder.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/stack_resource.py b/heat/engine/stack_resource.py index 5624500b4..22ea44d7c 100644 --- a/heat/engine/stack_resource.py +++ b/heat/engine/stack_resource.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/stack_user.py b/heat/engine/stack_user.py index 656ca045f..d96687ea2 100644 --- a/heat/engine/stack_user.py +++ b/heat/engine/stack_user.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/support.py b/heat/engine/support.py index 70908bed8..c1efc9dbc 100644 --- a/heat/engine/support.py +++ b/heat/engine/support.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/template.py b/heat/engine/template.py index 677e33f01..572f92151 100644 --- a/heat/engine/template.py +++ b/heat/engine/template.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/timestamp.py b/heat/engine/timestamp.py index 5ec39fb26..931612f85 100644 --- a/heat/engine/timestamp.py +++ b/heat/engine/timestamp.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/update.py b/heat/engine/update.py index eaf315f6f..1e0c94478 100644 --- a/heat/engine/update.py +++ b/heat/engine/update.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/engine/watchrule.py b/heat/engine/watchrule.py index 7b6c449d6..4abda92eb 100644 --- a/heat/engine/watchrule.py +++ b/heat/engine/watchrule.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/rpc/api.py b/heat/rpc/api.py index 9fb2a9a31..f4d614f90 100644 --- a/heat/rpc/api.py +++ b/heat/rpc/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/rpc/client.py b/heat/rpc/client.py index 589aeca31..8f883765d 100644 --- a/heat/rpc/client.py +++ b/heat/rpc/client.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012, Red Hat, Inc. # diff --git a/heat/tests/__init__.py b/heat/tests/__init__.py index d89db057e..44ecb97cc 100644 --- a/heat/tests/__init__.py +++ b/heat/tests/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/common.py b/heat/tests/common.py index 75e09cb88..adaac4e7f 100644 --- a/heat/tests/common.py +++ b/heat/tests/common.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/fakes.py b/heat/tests/fakes.py index 162ee3f2a..683347e29 100644 --- a/heat/tests/fakes.py +++ b/heat/tests/fakes.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/generic_resource.py b/heat/tests/generic_resource.py index 9519434f5..f11acfc12 100644 --- a/heat/tests/generic_resource.py +++ b/heat/tests/generic_resource.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_aws.py b/heat/tests/test_api_aws.py index 6a9c40f98..bbec7db35 100644 --- a/heat/tests/test_api_aws.py +++ b/heat/tests/test_api_aws.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py index 56ea39833..fcaa43fad 100644 --- a/heat/tests/test_api_cfn_v1.py +++ b/heat/tests/test_api_cfn_v1.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py index 767572ddb..13a4f7ef5 100644 --- a/heat/tests/test_api_cloudwatch.py +++ b/heat/tests/test_api_cloudwatch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_ec2token.py b/heat/tests/test_api_ec2token.py index c388b7db6..58d38443c 100644 --- a/heat/tests/test_api_ec2token.py +++ b/heat/tests/test_api_ec2token.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py index bacbf67a4..99cf4aa91 100644 --- a/heat/tests/test_api_openstack_v1.py +++ b/heat/tests/test_api_openstack_v1.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_openstack_v1_util.py b/heat/tests/test_api_openstack_v1_util.py index f64f8e49e..8208b512c 100644 --- a/heat/tests/test_api_openstack_v1_util.py +++ b/heat/tests/test_api_openstack_v1_util.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py b/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py index 1f435278f..d73b29343 100644 --- a/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py +++ b/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_api_openstack_v1_views_views_common.py b/heat/tests/test_api_openstack_v1_views_views_common.py index fa0654089..6b97bd9e8 100644 --- a/heat/tests/test_api_openstack_v1_views_views_common.py +++ b/heat/tests/test_api_openstack_v1_views_views_common.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_attributes.py b/heat/tests/test_attributes.py index 84d2949ad..2e8dbf876 100644 --- a/heat/tests/test_attributes.py +++ b/heat/tests/test_attributes.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_auth_password.py b/heat/tests/test_auth_password.py index f7d32c512..015c5a380 100644 --- a/heat/tests/test_auth_password.py +++ b/heat/tests/test_auth_password.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 OpenStack Foundation # diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py index 3c6a64318..bfdba3113 100644 --- a/heat/tests/test_autoscaling.py +++ b/heat/tests/test_autoscaling.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_autoscaling_update_policy.py b/heat/tests/test_autoscaling_update_policy.py index 9516b6808..83723d95b 100644 --- a/heat/tests/test_autoscaling_update_policy.py +++ b/heat/tests/test_autoscaling_update_policy.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py index 813592779..123a1ea2e 100644 --- a/heat/tests/test_ceilometer_alarm.py +++ b/heat/tests/test_ceilometer_alarm.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_clients.py b/heat/tests/test_clients.py index ae997e285..e2f67556d 100644 --- a/heat/tests/test_clients.py +++ b/heat/tests/test_clients.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_cloudwatch.py b/heat/tests/test_cloudwatch.py index fb4469e21..2624f6656 100644 --- a/heat/tests/test_cloudwatch.py +++ b/heat/tests/test_cloudwatch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_common_context.py b/heat/tests/test_common_context.py index 3813de7fa..9541a9b34 100644 --- a/heat/tests/test_common_context.py +++ b/heat/tests/test_common_context.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/tests/test_constraints.py b/heat/tests/test_constraints.py index 724634b8b..960351959 100644 --- a/heat/tests/test_constraints.py +++ b/heat/tests/test_constraints.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_cw_alarm.py b/heat/tests/test_cw_alarm.py index ebad819dc..3dea10a05 100644 --- a/heat/tests/test_cw_alarm.py +++ b/heat/tests/test_cw_alarm.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py index 37185faf7..bd3cd79f5 100644 --- a/heat/tests/test_dbinstance.py +++ b/heat/tests/test_dbinstance.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_dependencies.py b/heat/tests/test_dependencies.py index 3f1d0915d..0d37b515b 100644 --- a/heat/tests/test_dependencies.py +++ b/heat/tests/test_dependencies.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_eip.py b/heat/tests/test_eip.py index 670d86253..dcb9eb6cd 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py index a8ad37e74..36a58ae22 100644 --- a/heat/tests/test_engine_api_utils.py +++ b/heat/tests/test_engine_api_utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 61f37f591..9070601b2 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_environment.py b/heat/tests/test_environment.py index 0a177a6f9..d2e6087c8 100644 --- a/heat/tests/test_environment.py +++ b/heat/tests/test_environment.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/tests/test_environment_format.py b/heat/tests/test_environment_format.py index f56af837c..9807da561 100644 --- a/heat/tests/test_environment_format.py +++ b/heat/tests/test_environment_format.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_event.py b/heat/tests/test_event.py index b1ec96ab5..bfb731fea 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_fault_middleware.py b/heat/tests/test_fault_middleware.py index fae384174..93bdd8629 100644 --- a/heat/tests/test_fault_middleware.py +++ b/heat/tests/test_fault_middleware.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_function.py b/heat/tests/test_function.py index 7d8d97ac3..e0d2241b3 100644 --- a/heat/tests/test_function.py +++ b/heat/tests/test_function.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py index 2b8cbd822..694ae1331 100644 --- a/heat/tests/test_heatclient.py +++ b/heat/tests/test_heatclient.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_hot.py b/heat/tests/test_hot.py index 98acfd4a2..427423d6b 100644 --- a/heat/tests/test_hot.py +++ b/heat/tests/test_hot.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_identifier.py b/heat/tests/test_identifier.py index 4bc8721c0..d913edbda 100644 --- a/heat/tests/test_identifier.py +++ b/heat/tests/test_identifier.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_instance.py b/heat/tests/test_instance.py index 8d9a25142..859f214e9 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py index 6cbc44190..d08f47524 100644 --- a/heat/tests/test_instance_group.py +++ b/heat/tests/test_instance_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_instance_group_update_policy.py b/heat/tests/test_instance_group_update_policy.py index c9ae263a5..542862143 100644 --- a/heat/tests/test_instance_group_update_policy.py +++ b/heat/tests/test_instance_group_update_policy.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py index f15357c61..0aa3fc7b5 100644 --- a/heat/tests/test_instance_network.py +++ b/heat/tests/test_instance_network.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_iso8601_utils.py b/heat/tests/test_iso8601_utils.py index c661f0b81..4a91ec36b 100644 --- a/heat/tests/test_iso8601_utils.py +++ b/heat/tests/test_iso8601_utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index 0a4bdf710..0871b2488 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_loguserdata.py b/heat/tests/test_loguserdata.py index 5b22a48e9..54cd50c16 100644 --- a/heat/tests/test_loguserdata.py +++ b/heat/tests/test_loguserdata.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index 16622928f..eaa0005c0 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py index 0b0290003..a555e9dd3 100644 --- a/heat/tests/test_nested_stack.py +++ b/heat/tests/test_nested_stack.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_neutron.py b/heat/tests/test_neutron.py index fe99362d3..ed6c2c2b5 100644 --- a/heat/tests/test_neutron.py +++ b/heat/tests/test_neutron.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_neutron_autoscaling.py b/heat/tests/test_neutron_autoscaling.py index 3efeceabe..470fff12e 100644 --- a/heat/tests/test_neutron_autoscaling.py +++ b/heat/tests/test_neutron_autoscaling.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_neutron_firewall.py b/heat/tests/test_neutron_firewall.py index cc582fdeb..ccea8a349 100644 --- a/heat/tests/test_neutron_firewall.py +++ b/heat/tests/test_neutron_firewall.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/heat/tests/test_neutron_loadbalancer.py b/heat/tests/test_neutron_loadbalancer.py index f5081e1b5..2350c26e9 100644 --- a/heat/tests/test_neutron_loadbalancer.py +++ b/heat/tests/test_neutron_loadbalancer.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_neutron_network_gateway.py b/heat/tests/test_neutron_network_gateway.py index f493de570..06a48b71d 100644 --- a/heat/tests/test_neutron_network_gateway.py +++ b/heat/tests/test_neutron_network_gateway.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 NTT Corp. # All Rights Reserved. diff --git a/heat/tests/test_neutron_security_group.py b/heat/tests/test_neutron_security_group.py index ccf979550..216f88764 100644 --- a/heat/tests/test_neutron_security_group.py +++ b/heat/tests/test_neutron_security_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_neutron_vpnservice.py b/heat/tests/test_neutron_vpnservice.py index 99ea38e78..a023c457e 100644 --- a/heat/tests/test_neutron_vpnservice.py +++ b/heat/tests/test_neutron_vpnservice.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_nokey.py b/heat/tests/test_nokey.py index 77513445a..4a8aa3da1 100644 --- a/heat/tests/test_nokey.py +++ b/heat/tests/test_nokey.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_nova_keypair.py b/heat/tests/test_nova_keypair.py index e7bb71198..cd988b32c 100644 --- a/heat/tests/test_nova_keypair.py +++ b/heat/tests/test_nova_keypair.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_nova_utils.py b/heat/tests/test_nova_utils.py index 8b7d436e2..c61dfb314 100644 --- a/heat/tests/test_nova_utils.py +++ b/heat/tests/test_nova_utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/tests/test_os_database.py b/heat/tests/test_os_database.py index 369f8448d..8c63df849 100644 --- a/heat/tests/test_os_database.py +++ b/heat/tests/test_os_database.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_parameters.py b/heat/tests/test_parameters.py index 6f47d3138..b2ae542a8 100644 --- a/heat/tests/test_parameters.py +++ b/heat/tests/test_parameters.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_parser.py b/heat/tests/test_parser.py index 064a20f31..890bc914e 100644 --- a/heat/tests/test_parser.py +++ b/heat/tests/test_parser.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_plugin_loader.py b/heat/tests/test_plugin_loader.py index eed863784..37e8dd6fb 100644 --- a/heat/tests/test_plugin_loader.py +++ b/heat/tests/test_plugin_loader.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_properties.py b/heat/tests/test_properties.py index d6cb686d9..261ae0a45 100644 --- a/heat/tests/test_properties.py +++ b/heat/tests/test_properties.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py index 6f1c6c5b7..2ae10175b 100644 --- a/heat/tests/test_provider_template.py +++ b/heat/tests/test_provider_template.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_random_string.py b/heat/tests/test_random_string.py index 2b1927505..baa27a4ca 100644 --- a/heat/tests/test_random_string.py +++ b/heat/tests/test_random_string.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_resource.py b/heat/tests/test_resource.py index 65846bd6e..ae53c62be 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_resource_group.py b/heat/tests/test_resource_group.py index 8450d738f..3d8cfbb5b 100644 --- a/heat/tests/test_resource_group.py +++ b/heat/tests/test_resource_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/tests/test_rpc_client.py b/heat/tests/test_rpc_client.py index 305c75657..ebad18dff 100644 --- a/heat/tests/test_rpc_client.py +++ b/heat/tests/test_rpc_client.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012, Red Hat, Inc. # diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py index eb7c21ed9..3b72881af 100644 --- a/heat/tests/test_s3.py +++ b/heat/tests/test_s3.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_scheduler.py b/heat/tests/test_scheduler.py index c013ecea1..79bff23b7 100644 --- a/heat/tests/test_scheduler.py +++ b/heat/tests/test_scheduler.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_security_group.py b/heat/tests/test_security_group.py index aa2b2d3f3..ca37cec62 100644 --- a/heat/tests/test_security_group.py +++ b/heat/tests/test_security_group.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_server.py b/heat/tests/test_server.py index 984d2cae0..a4a1ef2f9 100644 --- a/heat/tests/test_server.py +++ b/heat/tests/test_server.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py index a84a19cfe..e0f10f889 100644 --- a/heat/tests/test_server_tags.py +++ b/heat/tests/test_server_tags.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_short_id.py b/heat/tests/test_short_id.py index 8519fdeac..25be5310a 100644 --- a/heat/tests/test_short_id.py +++ b/heat/tests/test_short_id.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_signal.py b/heat/tests/test_signal.py index 8b5da99a4..ac6f82782 100644 --- a/heat/tests/test_signal.py +++ b/heat/tests/test_signal.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_ssl_middleware.py b/heat/tests/test_ssl_middleware.py index 8f1e31bfc..cee59b536 100644 --- a/heat/tests/test_ssl_middleware.py +++ b/heat/tests/test_ssl_middleware.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py index 4c5bfbca9..ef7faf19e 100644 --- a/heat/tests/test_stack_resource.py +++ b/heat/tests/test_stack_resource.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_support.py b/heat/tests/test_support.py index 2babe8318..e3f9d0378 100644 --- a/heat/tests/test_support.py +++ b/heat/tests/test_support.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_swift.py b/heat/tests/test_swift.py index dfcccfa61..088be5460 100644 --- a/heat/tests/test_swift.py +++ b/heat/tests/test_swift.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index 134ea4fb9..45ea1a04b 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_urlfetch.py b/heat/tests/test_urlfetch.py index bd9e3df18..f113b53b0 100644 --- a/heat/tests/test_urlfetch.py +++ b/heat/tests/test_urlfetch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py index dce89092e..23fabd858 100644 --- a/heat/tests/test_user.py +++ b/heat/tests/test_user.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_validate.py b/heat/tests/test_validate.py index 78c6885fd..17b4350dd 100644 --- a/heat/tests/test_validate.py +++ b/heat/tests/test_validate.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_version_negotiation_middleware.py b/heat/tests/test_version_negotiation_middleware.py index dc227da22..409f6df08 100644 --- a/heat/tests/test_version_negotiation_middleware.py +++ b/heat/tests/test_version_negotiation_middleware.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_volume.py b/heat/tests/test_volume.py index 8ddb65d55..bcc7d7fb2 100644 --- a/heat/tests/test_volume.py +++ b/heat/tests/test_volume.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_vpc.py b/heat/tests/test_vpc.py index f0af9c1b1..2abd58b03 100644 --- a/heat/tests/test_vpc.py +++ b/heat/tests/test_vpc.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py index 69b6cb65a..2e690387f 100644 --- a/heat/tests/test_waitcondition.py +++ b/heat/tests/test_waitcondition.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_watch.py b/heat/tests/test_watch.py index 34c23a20c..bc1c4d7ce 100644 --- a/heat/tests/test_watch.py +++ b/heat/tests/test_watch.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/tests/test_wsgi.py b/heat/tests/test_wsgi.py index b7f631d83..4a14f3c8e 100644 --- a/heat/tests/test_wsgi.py +++ b/heat/tests/test_wsgi.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. diff --git a/heat/tests/utils.py b/heat/tests/utils.py index b219c5b7b..0b5f42e5f 100644 --- a/heat/tests/utils.py +++ b/heat/tests/utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # 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/heat/version.py b/heat/version.py index a717606be..4a2b02130 100644 --- a/heat/version.py +++ b/heat/version.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tools/cfn-json2yaml b/tools/cfn-json2yaml index 54de9ddb9..46ecedd05 100755 --- a/tools/cfn-json2yaml +++ b/tools/cfn-json2yaml @@ -1,6 +1,5 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # # 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/tools/install_venv.py b/tools/install_venv.py index bb28bce04..75eecec4a 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. |