diff --git a/neutron/api/api_common.py b/neutron/api/api_common.py index 5f6e5151ea3..e370e2e5a99 100644 --- 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 6f6210947a5..4369c2135c4 100644 --- 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 671a56ec305..cdfa1e081b5 100644 --- 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 08358e85f04..bd5e745ad31 100644 --- 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 4965d133873..1e46a94faa8 100644 --- 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 0701ff8cc5e..1be937cbaea 100644 --- 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 96602eca636..32fccb84747 100644 --- 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 a316ad6f2b3..dc8fb773b9a 100644 --- 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 04602b1382d..fa9d03b098c 100644 --- 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 718195f3491..bbf9d645579 100644 --- 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 615b017b754..045b7e3f26d 100644 --- 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 9eacaedf868..1f94f83974b 100644 --- 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 c74dac2be70..dc6a3cf4bb2 100644 --- 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 12f32e1e761..25b87ca4206 100644 --- 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 1fc5ec5523c..9037a0bb4a8 100644 --- 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 f0867e6cdc2..be3892b99bf 100644 --- 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 d550c260ca7..3e9ad15e092 100644 --- 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 23dd6447f9c..e1d525391a6 100644 --- 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 4ac574e5860..e69de29bb2d 100644 --- 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 994ad8eb1c7..90e26b06dbf 100644 --- 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 613b02804f8..6e50e93cb05 100644 --- 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 5f2c7a8c708..7c63baa22a6 100644 --- 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 b3279bb4311..922bec36058 100644 --- 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 4f7be18d132..c5937d932b4 100644 --- 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 e5d1b4ef421..da6bcb64e94 100644 --- 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 3463db93627..2a776fc90d8 100644 --- 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 c534b77f72a..80a1d45a9bd 100644 --- 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 3ed3f69256f..8dbcf712410 100644 --- 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 002c9f2a171..7e5c76dd3f2 100644 --- 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 1284ace3b20..944de104fb6 100644 --- 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 87e75ed4462..57000928092 100644 --- 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 fc84c016674..06ff9e259c8 100644 --- 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 17f032362b2..6168adf36f8 100644 --- 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 ad2960facd3..f6f18192570 100644 --- 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 dd9e4c82626..25633775d9e 100644 --- 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 4ffe65fd9ed..7c44725cea2 100644 --- 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. #