Removing vim header lines

Simply removes the vim header line and the empty line
following it (when present) for files in the api, db, and
extenssions base directories. In one single _init_ file in
this patchset, all comment lines are removed.

Change-Id: I81b7168dc2ad74b8c30a87e50a531e157851499e
Partial-Bug: 1229324

diff --git a/neutron/api/api_common.py b/neutron/api/api_common.py
index 5f6e5151ea3319041b6600ecf876cce725cb1a4d..e370e2e5a994c80fe5c6d0d0d8eacf709755bddb 100644 (file)
--- a/neutron/api/api_common.py
+++ b/neutron/api/api_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Citrix System.
 # All Rights Reserved.
 #

diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py
index 6f6210947a56c59b48e8d50e5920d51d4f3f861c..4369c2135c490a8680f2f8809f27e8e66202d516 100644 (file)
--- a/neutron/api/extensions.py
+++ b/neutron/api/extensions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.

diff --git a/neutron/api/versions.py b/neutron/api/versions.py
index 671a56ec3059cfa99222f41da1e54b63d7227de1..cdfa1e081b5fa090f6c39d3731fcdc5b6c4b1416 100644 (file)
--- a/neutron/api/versions.py
+++ b/neutron/api/versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Citrix Systems.
 # All Rights Reserved.
 #

diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py
index 08358e85f040af6ca32c5a1c100ad288f3a07109..bd5e745ad31ef1c931ed1bb0c6315b0a34bc1345 100644 (file)
--- a/neutron/db/agents_db.py
+++ b/neutron/db/agents_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py
index 4965d1338737be439c44bf25f71ff2ddfb86e9ae..1e46a94faa825030adeb626a1857db4daed308d1 100644 (file)
--- a/neutron/db/agentschedulers_db.py
+++ b/neutron/db/agentschedulers_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py
index 0701ff8cc5eb798380b0eff84de77ddbded83e85..1be937cbaea81a9eb8d5c879774300b5fa6456b6 100644 (file)
--- a/neutron/db/db_base_plugin_v2.py
+++ b/neutron/db/db_base_plugin_v2.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/external_net_db.py b/neutron/db/external_net_db.py
index 96602eca63670778fe8509ebe128668f6f8797bc..32fccb847474cf46f6615e831224c87c7062e194 100644 (file)
--- a/neutron/db/external_net_db.py
+++ b/neutron/db/external_net_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/extraroute_db.py b/neutron/db/extraroute_db.py
index a316ad6f2b3c7af11b3bf702620c002a6603a204..dc8fb773b9adf619adff251af8a3c5d3c2dd3052 100644 (file)
--- a/neutron/db/extraroute_db.py
+++ b/neutron/db/extraroute_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013, Nachi Ueno, NTT MCL, Inc.
 # All Rights Reserved.
 #

diff --git a/neutron/db/l3_agentschedulers_db.py b/neutron/db/l3_agentschedulers_db.py
index 04602b1382dedfa5322dbe0b0fc6364aa02bfcc7..fa9d03b098cde956e00ad91cddf6b9d6c851a55d 100644 (file)
--- a/neutron/db/l3_agentschedulers_db.py
+++ b/neutron/db/l3_agentschedulers_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py
index 718195f3491debd3cfa887752708d7fd1475218d..bbf9d6455790f89d94cea9138d70bb95d3fd4883 100644 (file)
--- a/neutron/db/models_v2.py
+++ b/neutron/db/models_v2.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/portbindings_base.py b/neutron/db/portbindings_base.py
index 615b017b75445ec521fd02a3e7f302af66c9fd9d..045b7e3f26df79365728dfe152088a9aaed275fc 100644 (file)
--- a/neutron/db/portbindings_base.py
+++ b/neutron/db/portbindings_base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 UnitedStack Inc.
 # All Rights Reserved.
 #

diff --git a/neutron/db/portbindings_db.py b/neutron/db/portbindings_db.py
index 9eacaedf86889d8e55cfcc91cbb691d1bb858b0c..1f94f83974b796d216ffabec91c91c14466a353d 100644 (file)
--- a/neutron/db/portbindings_db.py
+++ b/neutron/db/portbindings_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
 #

diff --git a/neutron/db/quota_db.py b/neutron/db/quota_db.py
index c74dac2be70b1a881ba583f709093f51a1808d14..dc6a3cf4bb24dcdf8d1a462f85b0063c5477a214 100644 (file)
--- a/neutron/db/quota_db.py
+++ b/neutron/db/quota_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/routedserviceinsertion_db.py b/neutron/db/routedserviceinsertion_db.py
index 12f32e1e761bf986d4a2c5e55556ad121c97069e..25b87ca4206076a9a5a5ad41479ea995992bbf51 100644 (file)
--- a/neutron/db/routedserviceinsertion_db.py
+++ b/neutron/db/routedserviceinsertion_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc.  All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/db/routerservicetype_db.py b/neutron/db/routerservicetype_db.py
index 1fc5ec5523c82ed753c73fec88fbd7d85337a2d4..9037a0bb4a80ed13cfed130e4007ef003eb6a425 100644 (file)
--- a/neutron/db/routerservicetype_db.py
+++ b/neutron/db/routerservicetype_db.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc.  All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py
index f0867e6cdc216a99a0b8864cb780c74ed5060331..be3892b99bf964fcf3dd6ebb43f3898877e2c7d0 100644 (file)
--- a/neutron/db/securitygroups_rpc_base.py
+++ b/neutron/db/securitygroups_rpc_base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
 # All Rights Reserved.
 #

diff --git a/neutron/db/servicetype_db.py b/neutron/db/servicetype_db.py
index d550c260ca704753e2ce39998f398742078d9463..3e9ad15e0925e664f5711aefdae45207aa60c1c4 100644 (file)
--- a/neutron/db/servicetype_db.py
+++ b/neutron/db/servicetype_db.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/db/sqlalchemyutils.py b/neutron/db/sqlalchemyutils.py
index 23dd6447f9ce6ebdfbc6ca69b44535fd77e74683..e1d525391a62801a0978d97ca1bf2df32c5b6e32 100644 (file)
--- a/neutron/db/sqlalchemyutils.py
+++ b/neutron/db/sqlalchemyutils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/__init__.py b/neutron/extensions/__init__.py
index 4ac574e5860ba82054f5a5b6d02d3e73abb5fe61..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/neutron/extensions/__init__.py
+++ b/neutron/extensions/__init__.py
@@ -1,15 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack Foundation
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.

diff --git a/neutron/extensions/dhcpagentscheduler.py b/neutron/extensions/dhcpagentscheduler.py
index 994ad8eb1c773360c5e49736d5d79d2fe6479705..90e26b06dbfb11f814115667ec50acfdc56dbd54 100644 (file)
--- a/neutron/extensions/dhcpagentscheduler.py
+++ b/neutron/extensions/dhcpagentscheduler.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/external_net.py b/neutron/extensions/external_net.py
index 613b02804f8d942824569a714fd4e2eb4f2ac3f0..6e50e93cb057648f279cde5325bcbc0f41e444ca 100644 (file)
--- a/neutron/extensions/external_net.py
+++ b/neutron/extensions/external_net.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/extraroute.py b/neutron/extensions/extraroute.py
index 5f2c7a8c708f8679a9870653f0dabe699e4415d9..7c63baa22a66d54e95f522dbad6bed8df8538211 100644 (file)
--- a/neutron/extensions/extraroute.py
+++ b/neutron/extensions/extraroute.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013, Nachi Ueno, NTT MCL, Inc.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/firewall.py b/neutron/extensions/firewall.py
index b3279bb431190904c52c0dce373e83c3a02eaede..922bec36058c8036cab2f6efa5797361bd81c28e 100644 (file)
--- a/neutron/extensions/firewall.py
+++ b/neutron/extensions/firewall.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 Big Switch Networks, Inc.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/flavor.py b/neutron/extensions/flavor.py
index 4f7be18d132f7dc18aaaf402f86c53b88006f646..c5937d932b46585bfa3da18d17f5c7d96d49d5f5 100644 (file)
--- a/neutron/extensions/flavor.py
+++ b/neutron/extensions/flavor.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Nachi Ueno, NTT MCL, Inc.
 # All rights reserved.
 #

diff --git a/neutron/extensions/l3agentscheduler.py b/neutron/extensions/l3agentscheduler.py
index e5d1b4ef4217b231e36f0bc72252552399b8e4de..da6bcb64e94c542f07a4737846ac28eb818a4ef4 100644 (file)
--- a/neutron/extensions/l3agentscheduler.py
+++ b/neutron/extensions/l3agentscheduler.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/lbaas_agentscheduler.py b/neutron/extensions/lbaas_agentscheduler.py
index 3463db93627a378f287158fa7d5f547458e134ea..2a776fc90d84eb4314adf24d9978d03ae81d6b18 100644 (file)
--- a/neutron/extensions/lbaas_agentscheduler.py
+++ b/neutron/extensions/lbaas_agentscheduler.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/loadbalancer.py b/neutron/extensions/loadbalancer.py
index c534b77f72a0dc753da79e2221cf923ac7313dfc..80a1d45a9bd925ddf38acc7f95a879d83b9ae225 100644 (file)
--- a/neutron/extensions/loadbalancer.py
+++ b/neutron/extensions/loadbalancer.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/multiprovidernet.py b/neutron/extensions/multiprovidernet.py
index 3ed3f69256fa9816662ff8e4d9b8368af91a5628..8dbcf712410a80396221ab49e70ca4a025a49202 100644 (file)
--- a/neutron/extensions/multiprovidernet.py
+++ b/neutron/extensions/multiprovidernet.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/portbindings.py b/neutron/extensions/portbindings.py
index 002c9f2a1710722a8fb9836b317a1784ac77aaab..7e5c76dd3f25e6167650b2bdb5cd669b818e7059 100644 (file)
--- a/neutron/extensions/portbindings.py
+++ b/neutron/extensions/portbindings.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/providernet.py b/neutron/extensions/providernet.py
index 1284ace3b203d76bc60f21ca92e747b48c319b72..944de104fb6690fef7d0d827e178a3ee92c96a28 100644 (file)
--- a/neutron/extensions/providernet.py
+++ b/neutron/extensions/providernet.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/quotasv2.py b/neutron/extensions/quotasv2.py
index 87e75ed446213fe98bdc989d2389b0975a8d707f..570009280925f2cdbe6b1208d53131a32ca98ffb 100644 (file)
--- a/neutron/extensions/quotasv2.py
+++ b/neutron/extensions/quotasv2.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/routedserviceinsertion.py b/neutron/extensions/routedserviceinsertion.py
index fc84c016674b6f728a82ee8652018a6e1d6e1965..06ff9e259c837cae0b44788d136847130c65b90a 100644 (file)
--- a/neutron/extensions/routedserviceinsertion.py
+++ b/neutron/extensions/routedserviceinsertion.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc.  All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/extensions/routerservicetype.py b/neutron/extensions/routerservicetype.py
index 17f032362b235912ad45edb482b29e04ddb08fa4..6168adf36f83a5fb661d9eb274f7fc65fd92b73a 100644 (file)
--- a/neutron/extensions/routerservicetype.py
+++ b/neutron/extensions/routerservicetype.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 VMware, Inc.  All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py
index ad2960facd3450360bd8522464703dbd41e4eec6..f6f181925709eda0686db2e7f3b6382eeede6ac1 100644 (file)
--- a/neutron/extensions/securitygroup.py
+++ b/neutron/extensions/securitygroup.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation.
 # All rights reserved.
 #

diff --git a/neutron/extensions/servicetype.py b/neutron/extensions/servicetype.py
index dd9e4c82626fe858118706cf1c46b926dde25f70..25633775d9ea4c463980552d6757df18143e8054 100644 (file)
--- a/neutron/extensions/servicetype.py
+++ b/neutron/extensions/servicetype.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/neutron/extensions/vpnaas.py b/neutron/extensions/vpnaas.py
index 4ffe65fd9edccd141afa6b8c653bbb8335155cea..7c44725cea29c5e185de0021301b36f9fd3dae52 100644 (file)
--- a/neutron/extensions/vpnaas.py
+++ b/neutron/extensions/vpnaas.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #