diff --git a/bin/heat-api b/bin/heat-api index 3bfa8e757d..3d9bcc85ed 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 8d0371c3ec..a5e753aec9 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 76f123cf58..803cffe474 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 c25ec5d260..14ef7ce064 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 32bdc8f788..83d9de7748 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 094c6ac729..de5ceefb6f 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 cd40648190..291a25cd6f 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 40eb8c2dc8..4f69904df9 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 063ab8a741..3dfe062106 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 6f3fc727d2..165ac9ff34 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 780ed37541..6f0ad45ffa 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 d1e6f986f9..aa387d3346 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 582a6b7273..f7a522f38e 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 606da78654..a09b5538e9 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 df34b855c8..5d1e857d47 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 57e2d0f65d..2e9772bc70 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 8ca4d44d36..f524cb4a20 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 9177e254b0..7f5140875f 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 f11966e1ac..530abfa2e4 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 b7e12f7439..f298e8ab83 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 d00d7f1302..0ff0c5a4f2 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 119fcfa53d..abfbbf4163 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 3f74d47715..484170a663 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 a6407d4e2a..722a79b345 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 a49db0df89..bb3f9f9101 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 a6407d4e2a..722a79b345 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 093a9f5857..ec4f3b24f9 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 7063cd71a6..491a3331bd 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 5d3de30409..081cedf994 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 e500e885d7..b30346410b 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 9786549292..23ad9e0c3f 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 3660644792..ac2c052454 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 0d387d3bcd..da3cdb1f62 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 9601028b91..cbe40289b2 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 5d9ddeae2f..e015c15783 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 ace417cc57..a770e4f1ff 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 c4d095cdf1..aedb4c9173 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 23976a0dc0..0814509511 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 7a11fc7f32..3a494a709d 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 67524ef9d8..ab0bb037dc 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 a6407d4e2a..722a79b345 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 06bd2da45a..5f2d3e64a4 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 8f512ab899..723fcfc1ae 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 31d348e50e..9ebf2b714a 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 564d13b838..8a82afa62f 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 3996a78a06..c87678f93e 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 4ad416077a..d57de40fca 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 74d71a1388..31786c0e2d 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 b196f6d53a..5ede75bd8b 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 fce1f065df..15ec44348c 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 fda926061a..170190dbcc 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 b59a7519e1..aa45f76bc8 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 2bac8e90fd..6468742ce0 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 83c9fcb964..75a500b10f 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 4831fbddce..54e496f86e 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 df24de72ef..82add4d840 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 6194e5ba9a..9892103f1a 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 03880b8f14..557224f34a 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 541bc4eb17..a0623e3e07 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 525716a212..7557604d3f 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 7771c34d1e..f91b57e3d9 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 f475691f14..f2c7925cb2 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 e3f1a4a6b8..3f4905fa94 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 81261406df..602cfd4add 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 2b374d30ac..7fc1292137 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 7b8f70fd6e..892bdb4fb9 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 4d635650d5..0da3d27037 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 7fa31afb8b..2491ed0d68 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 35a8ca9fef..17e9ba374f 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 920f29f332..642b0f9c88 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 3070f887c6..24db8e9ea5 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 69e7cb992d..e67309c063 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 bd974968e2..c3e73bd4a3 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 3a3f80b71d..b5870af1da 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 9a5424687b..7f070e199e 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 65b933cf45..a7a04a234c 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 b359ff11ce..27901921a9 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 fbc2ba4f15..e468f767cc 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 17722b1581..5f39e77cab 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 07408b54b5..e0c3761563 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 bbecf8ce19..7111910927 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 040cc7d072..8646a62407 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 0db39e3c28..6d4013b6ee 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 2351d45d0d..eb5b8b1706 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 f36a919fa6..2128c0de3f 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 a46c91fcc4..f4b0a5bbf5 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 871e26a09a..9645394367 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 b7fb294911..7d8448bbbf 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 586d0d61da..995accda7d 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 819b4dbe6b..bba3c83510 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 1d5ef14f59..37e0e0a0e0 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 33791b0c77..802400ed2e 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 847701f2b1..2f48ff2e82 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 6977f16cf3..6806f06cbd 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 d6a8c11b87..dba6ca9474 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 16525d79cb..32db4b995c 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 770623d7f0..0b6e3897ca 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 50d30b2634..a77774bec0 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 0edeb887cd..9e8fdad9cf 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 6e7ff071b6..b6041535c2 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 bcc6a41121..0593549675 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 ca9bfaa5c4..a0b92863e4 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 76d304598f..9470625ccb 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 9f65e2f3e3..0808d36984 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 4476832745..c1220ed07c 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 17e0377606..51d82cbde9 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 6f39c07b00..14b4c59165 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 ea3bac5b2c..4ae63b63f2 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 bb44911f0f..a795d79a13 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 b86e3c47b8..b884427ff3 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 158079d1e5..d12fa0db6b 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 a4e8798533..e5cc802cb9 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 21d0679031..9d52af4954 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 c7c7dd34eb..0b586c6ba6 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 227165d1a2..6a4ae7ba7d 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 54b446d45f..0b6b4a6d71 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 fd58e13601..adeae25771 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 87ce9e0ffa..7561e68279 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 a508b0428e..8a9047b586 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 7eee847d87..6735edc004 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 7b4192fb31..476962360a 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 65f381e1a0..fc7d2af465 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 64c68a7f60..edc54092d0 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 87410e04ce..af8c7e2ea0 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 beb1891555..bde3cc7b03 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 52d887d065..6cf369aeae 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 3f67566ac0..810bb0ee6f 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 fd431a07cf..c3c87ce5db 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 903dfec976..d1bb11a72f 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 3ecf4b661e..fc3ac72be0 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 0564f28625..acc5ce324c 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 46ba665b1b..1e8e4316cb 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 3378dcba58..f5a3e944cf 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 fc7d8f3133..8fb6e94271 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 c6c0b895b8..7ca6678ee3 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 238919ec13..03f3ed6811 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 e174dcbe49..ee8538b006 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 d4b932631e..ddad74e61c 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 5b1eaecc4e..0bd89e0047 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 2386338d37..198645e241 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 979371dfcd..503d9105b5 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 d6476a7142..83d1c77f68 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 384bd74dc1..e75f671ddc 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 70908bed81..c1efc9dbcc 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 b2c128269d..1f4962e606 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 5ec39fb26f..931612f857 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 eaf315f6ff..1e0c94478b 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 7b6c449d60..4abda92eb5 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 05d3cbf37a..6fe3784ebc 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 589aeca31b..8f883765dc 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 d89db057e1..44ecb97cc5 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 75e09cb885..adaac4e7fc 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 235df443dd..a8690faa1a 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 b1fd18b415..c3c8d86e26 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 6a9c40f98d..bbec7db35f 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 56ea398336..fcaa43fadf 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 767572ddb1..13a4f7ef56 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 c388b7db68..58d38443c6 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 46defa2184..a12d4b301d 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 f64f8e49e3..8208b512cd 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 1f435278f6..d73b29343f 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 fa0654089a..6b97bd9e89 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 84d2949ad4..2e8dbf8766 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 f7d32c5124..015c5a3800 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 111f3cdf80..25ba72c4c7 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 9516b6808c..83723d95b3 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 8135927795..123a1ea2e0 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 ae997e2857..e2f67556d5 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 fb4469e216..2624f66562 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 3813de7fa3..9541a9b347 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 724634b8b9..9603519594 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 ebad819dc0..3dea10a054 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 37185faf7e..bd3cd79f5a 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 3f1d0915d3..0d37b515b4 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 670d862537..dcb9eb6cd3 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 39e121caeb..4b588c2f07 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 f9d4fa4c3e..beac5b85e2 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 89f577d9c9..a78593c822 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 f56af837c9..9807da5619 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 b1ec96ab5f..bfb731fea2 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 fae3841749..93bdd86291 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 7d8d97ac33..e0d2241b3c 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 3b598ffefa..a2171b16c8 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 777b19f77e..f9fe1bd6e9 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 4bc8721c09..d913edbdac 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 8d9a251423..859f214e96 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 6cbc44190a..d08f475249 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 c9ae263a5e..5428621432 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 f15357c610..0aa3fc7b51 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 c661f0b816..4a91ec36b6 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 0a4bdf7102..0871b24883 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 5b22a48e9f..54cd50c167 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 16622928f6..eaa0005c0e 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 0b02900037..a555e9dd31 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 88eb523343..91259619e1 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 3efeceabe9..470fff12e8 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 cc582fdeba..ccea8a3496 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 dc36485cd0..f8a0164c52 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 f493de5709..06a48b71d7 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 ccf9795509..216f887645 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 99ea38e78e..a023c457e4 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 77513445ae..4a8aa3da1b 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 e7bb711986..cd988b32c0 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 89d744b569..e09e2ad8af 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 369f8448d4..8c63df8496 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 2e2f779b12..6ad54c6ce9 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 e1b43b45c8..a4d88c463c 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 eed863784e..37e8dd6fb2 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 d6cb686d92..261ae0a450 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 6f1c6c5b7f..2ae10175bc 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 2b19275054..baa27a4ca7 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 65846bd6ec..ae53c62bec 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 8450d738f1..3d8cfbb5b9 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 305c756577..ebad18dff3 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 eb7c21ed94..3b72881afc 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 c013ecea1d..79bff23b79 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 aa2b2d3f3a..ca37cec62d 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 76667ba446..d7ac283668 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 a84a19cfe7..e0f10f8893 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 8519fdeaca..25be5310af 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 4e506975ab..e748e91326 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 8f1e31bfce..cee59b5361 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 546e670505..afb8e1fc85 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 2babe8318b..e3f9d03783 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 dfcccfa61a..088be5460f 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 134ea4fb9e..45ea1a04ba 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 bd9e3df187..f113b53b0d 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 dce89092ee..23fabd8588 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 42660a50f5..01da0356f9 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 dc227da22d..409f6df08b 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 8ddb65d554..bcc7d7fb2b 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 f0af9c1b14..2abd58b035 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 69b6cb65a7..2e690387f5 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 34c23a20cf..bc1c4d7cef 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 b7f631d836..4a14f3c8e8 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 b219c5b7b3..0b5f42e5f4 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 a717606bef..4a2b021306 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 54de9ddb98..46ecedd05f 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 bb28bce04f..75eecec4ae 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.