Merge "Remove vim header from files."

64 files changed, 0 insertions, 64 deletions

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