Remove vim header

No need to set tabstop tons of times, this can be set in your vimrc
file instead.

More disucssion:
http://openstack.10931.n7.nabble.com/Remove-vim-modelines-td21780.html

Partial-Bug: #1229324
Change-Id: Ib3a31c8819ee1950d72f7da5627593623d351560

diff --git a/bin/cinder-all b/bin/cinder-all
index a4785950e8c7a6b6eeb332a32b27f23f50089789..f33c25bf4bce52b0a4a9934a3b2b8060ecd45230 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack, LLC
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/bin/cinder-api b/bin/cinder-api
index fe8611154853f27b66b8b84cad15075f85930690..5d4ea2615da5ea1238006ead21b1151518ffee79 100755 (executable)
--- a/bin/cinder-api
+++ b/bin/cinder-api
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.

diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues
index f2e9f33eb3f5f7880595e1cf23553ddddb7181f1..4a59b8b3d5edb904e3e36d6462e925718fd3075e 100755 (executable)
--- a/bin/cinder-clear-rabbit-queues
+++ b/bin/cinder-clear-rabbit-queues
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/bin/cinder-manage b/bin/cinder-manage
index 1a206ba137ace38c81ad223b42397ceff4ebaf88..dc29a2859ac4d08156106b77e01eef6a56d4d5c5 100755 (executable)
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/bin/cinder-rootwrap b/bin/cinder-rootwrap
index 456044824f45df0b2656f09fd4ce7c929b0103a5..f48d3f775e2e2b15f6f17e8020aa232dbd1c2969 100755 (executable)
--- a/bin/cinder-rootwrap
+++ b/bin/cinder-rootwrap
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/bin/cinder-rpc-zmq-receiver b/bin/cinder-rpc-zmq-receiver
index e8dbf0effe009399434022b8bc7e6fc2b825646c..07db167b0bd773dabf1811ae64dfb80606f1d84c 100755 (executable)
--- a/bin/cinder-rpc-zmq-receiver
+++ b/bin/cinder-rpc-zmq-receiver
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2011 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler
index 752b0cfefeadc6b3e9b27fdbf5b016805475bf48..e8ee1175bafa01038561a04282a04c9bdc7cb63d 100755 (executable)
--- a/bin/cinder-scheduler
+++ b/bin/cinder-scheduler
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.

diff --git a/bin/cinder-volume b/bin/cinder-volume
index 53f31edcf66c68421df9c9435c98ede05a7d12a4..c461c1ef7db9dfabc48ef209707e734ac29785d4 100755 (executable)
--- a/bin/cinder-volume
+++ b/bin/cinder-volume
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.

diff --git a/bin/cinder-volume-usage-audit b/bin/cinder-volume-usage-audit
index 40e31f1c5dc515ca8cd9540f0d2c611e4bac6823..6d3aac43147682fa19c02aa4cb14b7ae7603a9d9 100755 (executable)
--- a/bin/cinder-volume-usage-audit
+++ b/bin/cinder-volume-usage-audit
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/__init__.py b/cinder/__init__.py
index d765b088e93f62b9409a59942cbd91a2ae43d505..2b43c2fafd21c00c2eb94e03c21a6969fa310686 100644 (file)
--- a/cinder/__init__.py
+++ b/cinder/__init__.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/api/__init__.py b/cinder/api/__init__.py
index 8bd465ba430b4af59a2dbdacd359389e9deac46d..a3a0371ebc924f3ba5e010ddd175d400a3b1cdab 100644 (file)
--- a/cinder/api/__init__.py
+++ b/cinder/api/__init__.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/api/common.py b/cinder/api/common.py
index 889a249a51d99f3921d713207101a6404f993328..d6fe9efbcd5c2d4d75bf206daa867930122200be 100644 (file)
--- a/cinder/api/common.py
+++ b/cinder/api/common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/contrib/__init__.py b/cinder/api/contrib/__init__.py
index 7fb1e78690f167ee8d3aa67da602c3803da6fbcb..48804e81e68cf15cb4fa2a41be987d970e1a90d1 100644 (file)
--- a/cinder/api/contrib/__init__.py
+++ b/cinder/api/contrib/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/api/contrib/image_create.py b/cinder/api/contrib/image_create.py
index e34b5d550a77642a79d040e3b607eb7aa502dcea..3358831143d252b9c6fec427ea5eb6cb0de53472 100644 (file)
--- a/cinder/api/contrib/image_create.py
+++ b/cinder/api/contrib/image_create.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NTT.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/api/contrib/qos_specs_manage.py b/cinder/api/contrib/qos_specs_manage.py
index ef8fc987e708c07f6e3a6d95a46bcb65fae5b62a..d73862d666f9d49b1662c8ecb775b5c9a95d7d3e 100644 (file)
--- a/cinder/api/contrib/qos_specs_manage.py
+++ b/cinder/api/contrib/qos_specs_manage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 eBay Inc.
 # Copyright (c) 2013 OpenStack Foundation
 #

diff --git a/cinder/api/contrib/quotas.py b/cinder/api/contrib/quotas.py
index d9ae464d592907b921e7a83b857506642f240b28..3dd9919b4348485e423c0adcdc3a3e164de79ff4 100644 (file)
--- a/cinder/api/contrib/quotas.py
+++ b/cinder/api/contrib/quotas.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/contrib/scheduler_hints.py b/cinder/api/contrib/scheduler_hints.py
index 69658ded32316a4450c1ee97522dd31872c8f824..fca3422203c1cad46aa8a8315f6693ff1d01704a 100644 (file)
--- a/cinder/api/contrib/scheduler_hints.py
+++ b/cinder/api/contrib/scheduler_hints.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py
index 102668dae196c75355c0014cdc6f0b2c5cd65b56..998208665b53c1d637984048830115589a13eaf8 100644 (file)
--- a/cinder/api/contrib/services.py
+++ b/cinder/api/contrib/services.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 IBM Corp.
 # All Rights Reserved.
 #

diff --git a/cinder/api/contrib/types_extra_specs.py b/cinder/api/contrib/types_extra_specs.py
index de719f9918899971a47ab616d3f1cfaf1e195275..fd128561bfaabc2affb6df41feaa0d77fcf09ca7 100644 (file)
--- a/cinder/api/contrib/types_extra_specs.py
+++ b/cinder/api/contrib/types_extra_specs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 #

diff --git a/cinder/api/contrib/types_manage.py b/cinder/api/contrib/types_manage.py
index 9a3efee58e9306972539be5d44f2e14434ac5247..b6fcf1022fc3240a919a776f8609363e50ccb202 100644 (file)
--- a/cinder/api/contrib/types_manage.py
+++ b/cinder/api/contrib/types_manage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 #

diff --git a/cinder/api/contrib/used_limits.py b/cinder/api/contrib/used_limits.py
index 63e9af4c404a4351875c276e1148dadc7da047c8..a36ceb9447b151eefba9b1d634a501703511c67a 100644 (file)
--- a/cinder/api/contrib/used_limits.py
+++ b/cinder/api/contrib/used_limits.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/api/contrib/volume_encryption_metadata.py b/cinder/api/contrib/volume_encryption_metadata.py
index af309f1141563130a04859071965a01a35d5bb0e..532d40b7f03a35b161a11d6b78c2f1fb97177fea 100644 (file)
--- a/cinder/api/contrib/volume_encryption_metadata.py
+++ b/cinder/api/contrib/volume_encryption_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/api/contrib/volume_transfer.py b/cinder/api/contrib/volume_transfer.py
index f45262fb4300dfab0e28dcd3b883be9716a040ba..b3e46cd09a2d87c890f9df396e23b6c8fb7816e2 100644 (file)
--- a/cinder/api/contrib/volume_transfer.py
+++ b/cinder/api/contrib/volume_transfer.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/contrib/volume_type_encryption.py b/cinder/api/contrib/volume_type_encryption.py
index e6d28f07a254e19a364ed8818adf266926582cc1..85f10a1e3d11e76205413b45e94bf152e2d7e4dd 100644 (file)
--- a/cinder/api/contrib/volume_type_encryption.py
+++ b/cinder/api/contrib/volume_type_encryption.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py
index 1e98b6dc5fdd2927bdc65c970112643a03b42052..b20323d89de41ae435a0cad43c5e5628178bfd60 100644 (file)
--- a/cinder/api/extensions.py
+++ b/cinder/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/cinder/api/middleware/auth.py b/cinder/api/middleware/auth.py
index 8672d040849f57e2a72637d441783dcb5cc22041..b1b4c999fffe2a6f228661a92f577b2724aeb5f5 100644 (file)
--- a/cinder/api/middleware/auth.py
+++ b/cinder/api/middleware/auth.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/middleware/fault.py b/cinder/api/middleware/fault.py
index 0a500094c2f2fd1830f0aa9509bcace0c828d28a..020b769064408b5268bc568fefbf00f19938d05d 100644 (file)
--- a/cinder/api/middleware/fault.py
+++ b/cinder/api/middleware/fault.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/api/middleware/sizelimit.py b/cinder/api/middleware/sizelimit.py
index 5a39549654f121dfdf50a75f5bec797501cef5c7..4c3717b2b848d242440734f2603f73724ce0d6b2 100644 (file)
--- a/cinder/api/middleware/sizelimit.py
+++ b/cinder/api/middleware/sizelimit.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 5f88a74a7bb8c7dc843ba8c6edaec735a74b621b..8c97a1db1f840c0c6cc62c91bd51793ea1f54530 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.

diff --git a/cinder/api/urlmap.py b/cinder/api/urlmap.py
index 13c95208b73e953c1fc1b781b7888bf9b82dfe72..e3a9ee5fb3baf6bd9169e1d26cf998d1bdaf8328 100644 (file)
--- a/cinder/api/urlmap.py
+++ b/cinder/api/urlmap.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/v1/router.py b/cinder/api/v1/router.py
index 37595725c2a5c3355d32a6f990d81206caa77b31..12259ec0051e59dd4262c127e470f9104ed11b86 100644 (file)
--- a/cinder/api/v1/router.py
+++ b/cinder/api/v1/router.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2011 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/api/v1/snapshot_metadata.py b/cinder/api/v1/snapshot_metadata.py
index 3638284411d4e5904293f2925007e89c7b18acd0..b2df8b68f3071e113d807f0d4e25e384e2923f05 100644 (file)
--- a/cinder/api/v1/snapshot_metadata.py
+++ b/cinder/api/v1/snapshot_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/v1/types.py b/cinder/api/v1/types.py
index 99eb33d6e75cab45aa8144acf024ee8baa359144..aa1256b33eaafc5bfd6dc144dfd081239cd52147 100644 (file)
--- a/cinder/api/v1/types.py
+++ b/cinder/api/v1/types.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 #

diff --git a/cinder/api/v1/volume_metadata.py b/cinder/api/v1/volume_metadata.py
index 141bbba731ff3666f8067c68f3d5479abcc89d36..1b916d5675f7953212c33cf17e6c3a9edd779c49 100644 (file)
--- a/cinder/api/v1/volume_metadata.py
+++ b/cinder/api/v1/volume_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/v2/router.py b/cinder/api/v2/router.py
index 94649bbc1d7e54e770d72ded0b2f51fdae96df9f..44821c46599b312de3548e5ae102afe1dbd952ab 100644 (file)
--- a/cinder/api/v2/router.py
+++ b/cinder/api/v2/router.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2011 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/api/v2/snapshot_metadata.py b/cinder/api/v2/snapshot_metadata.py
index 3638284411d4e5904293f2925007e89c7b18acd0..b2df8b68f3071e113d807f0d4e25e384e2923f05 100644 (file)
--- a/cinder/api/v2/snapshot_metadata.py
+++ b/cinder/api/v2/snapshot_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/v2/types.py b/cinder/api/v2/types.py
index 9a64c523b12be49963e418b939d110a8e59c3178..99d5ffd50d5e8c489eb9e8111aacced3fe5d3fe7 100644 (file)
--- a/cinder/api/v2/types.py
+++ b/cinder/api/v2/types.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 #

diff --git a/cinder/api/v2/views/volumes.py b/cinder/api/v2/views/volumes.py
index f904395814e797046aa89d0309168d7d7275c608..c1b45acc65546ae88df0c3a24f0c4c2f8d28d3a2 100644 (file)
--- a/cinder/api/v2/views/volumes.py
+++ b/cinder/api/v2/views/volumes.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/v2/volume_metadata.py b/cinder/api/v2/volume_metadata.py
index cf8ef548b7f85c32ea2bddf5a54dc77cdb381516..d2bc37d8537b7ab071342983dc952a5ffcbb1f4f 100644 (file)
--- a/cinder/api/v2/volume_metadata.py
+++ b/cinder/api/v2/volume_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/cinder/api/versions.py b/cinder/api/versions.py
index 00044df3486a4779d27bbedc14f3ad09e1ed180c..9981ee9705a3184c0d7c98aca725114dccc521c3 100644 (file)
--- a/cinder/api/versions.py
+++ b/cinder/api/versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/views/limits.py b/cinder/api/views/limits.py
index c17baeda05a457e269e68bf0e6f2cb506efd3f06..528ca417dd7382bd047dfb8972a88c6813548cf2 100644 (file)
--- a/cinder/api/views/limits.py
+++ b/cinder/api/views/limits.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/views/types.py b/cinder/api/views/types.py
index 1552d72a63f4274af7204d64b3eda9a448c80f9f..d542c9f9ab64c03a0c4357786e1e11861eef29f4 100644 (file)
--- a/cinder/api/views/types.py
+++ b/cinder/api/views/types.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/api/views/versions.py b/cinder/api/views/versions.py
index f7881a8a642985920b0236c38d7730dabf1010d8..afa03afe455d5f54941cc4aac3771afd55731c56 100644 (file)
--- a/cinder/api/views/versions.py
+++ b/cinder/api/views/versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/api/xmlutil.py b/cinder/api/xmlutil.py
index 728d4761d48b8a3552af21d63764c98ad0617777..cf96968d6f0f8f1d1109a61eff8625032f397ed3 100644 (file)
--- a/cinder/api/xmlutil.py
+++ b/cinder/api/xmlutil.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/backup/rpcapi.py b/cinder/backup/rpcapi.py
index 62a8ccb965b68054417dad5d2f2653abe8b2db19..42941ff05c95cb93f5bb78c6ebdc4c8c082976f6 100644 (file)
--- a/cinder/backup/rpcapi.py
+++ b/cinder/backup/rpcapi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #

diff --git a/cinder/brick/exception.py b/cinder/brick/exception.py
index 0e9ed4b4366328ec00f363e208e365e801aca728..3d6e014dcddd585dab522c7454b252415f12cde2 100644 (file)
--- a/cinder/brick/exception.py
+++ b/cinder/brick/exception.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/brick/executor.py b/cinder/brick/executor.py
index f7a44c09c90398e2bb6d96a5f3be5e8570fcc772..de689521cce73dcd7f9b6bbbfc77c7d57fbbc809 100644 (file)
--- a/cinder/brick/executor.py
+++ b/cinder/brick/executor.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
index 743d1aff91d9e9c158e0c6974183554f80ee5418..996318383d9f24d10e632aebb6d1d2d3e1bed20a 100644 (file)
--- a/cinder/brick/initiator/connector.py
+++ b/cinder/brick/initiator/connector.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/cinder/brick/initiator/host_driver.py b/cinder/brick/initiator/host_driver.py
index dc9154e2ae7d24fb6c79b323b137399407bce5b0..5de57ccdac099c8593ebccb561e490bb0bbc57d7 100644 (file)
--- a/cinder/brick/initiator/host_driver.py
+++ b/cinder/brick/initiator/host_driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/cinder/brick/initiator/linuxfc.py b/cinder/brick/initiator/linuxfc.py
index 360178967036508e603a606a58a9e2f59029a9e4..2b6099c825470aacd94014355a4b8493bdd5ab3f 100644 (file)
--- a/cinder/brick/initiator/linuxfc.py
+++ b/cinder/brick/initiator/linuxfc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/brick/initiator/linuxscsi.py b/cinder/brick/initiator/linuxscsi.py
index 70bd4d19034e56cbc32860fd5eea4e7a0724f634..83e41d99db9b39fd43e75c224f6033c5dc7eece5 100644 (file)
--- a/cinder/brick/initiator/linuxscsi.py
+++ b/cinder/brick/initiator/linuxscsi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py
index d942e9886067d15da62a4c5175d984d5023689f3..fbdc0639a12e90c7058207ab63d8da9976ffed77 100644 (file)
--- a/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/brick/local_dev/lvm.py b/cinder/brick/local_dev/lvm.py
index 8772d1c1c660aa1b2baad0a8973e27e95711ed36..ddb46c8f18dad6d894d74a31f6246c1bcc471245 100644 (file)
--- a/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/cinder/brick/remotefs/remotefs.py b/cinder/brick/remotefs/remotefs.py
index 4ac0a3d4a5c9fe783baed3d00717a7799b10bc9a..8239d9e724d45d9c2e274cb8b15bb25b75170d86 100644 (file)
--- a/cinder/brick/remotefs/remotefs.py
+++ b/cinder/brick/remotefs/remotefs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 OpenStack Foundation
 # All Rights Reserved
 #

diff --git a/cinder/common/config.py b/cinder/common/config.py
index 4583acf41ff48419530649d8813a245fc958a40c..d3ce0cb35f8b56934092a1b146d294dc692efc7b 100644 (file)
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/common/sqlalchemyutils.py b/cinder/common/sqlalchemyutils.py
index 430761f88871c94a36b6ccf4ba0942432b38e191..dca0bd5aa36482e07dbc0f4f0c1721d536bbbfad 100644 (file)
--- a/cinder/common/sqlalchemyutils.py
+++ b/cinder/common/sqlalchemyutils.py
@@ -1,5 +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.
 # Copyright 2010-2011 OpenStack Foundation

diff --git a/cinder/compute/aggregate_states.py b/cinder/compute/aggregate_states.py
index 92a6743fb08348a60834419ec12b2ebfefa5b0c5..149f403f7512340d9414de522dd281acd7e80b97 100644 (file)
--- a/cinder/compute/aggregate_states.py
+++ b/cinder/compute/aggregate_states.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/context.py b/cinder/context.py
index 2e077d79fdbeae76c576c49c96841d08279e2e16..c97fdea8e5ea5fc97b4847096b9fb6912e18f991 100644 (file)
--- a/cinder/context.py
+++ b/cinder/context.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/db/__init__.py b/cinder/db/__init__.py
index f4eb417ec9fd51d17413bacec6a40dfc79e657c0..e59bc4f3fc4e38a9b347557866d2119f513e20c3 100644 (file)
--- a/cinder/db/__init__.py
+++ b/cinder/db/__init__.py
@@ -1,6 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.

diff --git a/cinder/db/api.py b/cinder/db/api.py
index e4164253df79d639cdce7b28c7a4f12a070a6dc7..81f2856c334100f31d70513c02bcd80defdda79d 100644 (file)
--- a/cinder/db/api.py
+++ b/cinder/db/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/db/base.py b/cinder/db/base.py
index 0aa6f9d18bb8c9589fea53300f586428c774942c..21a862f564a3e286f611060677ca35d76a2dfdf7 100644 (file)
--- a/cinder/db/base.py
+++ b/cinder/db/base.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/db/migration.py b/cinder/db/migration.py
index 053c74a9e90b3696004c6ce3c5e2fcff6f7930c0..041aeb7eb97a46c22fa58d671b3fd8d7e6efdfde 100644 (file)
--- a/cinder/db/migration.py
+++ b/cinder/db/migration.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index 6260518948bf776f9fffde783b0af326bd2ca4ed..e433dca6bd557f4ed67f499b66ca04a2128706cb 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py
old mode 100644 (file)
new mode 100755 (executable)
index ed526c6..a714db6
--- a/cinder/db/sqlalchemy/migrate_repo/manage.py
+++ b/cinder/db/sqlalchemy/migrate_repo/manage.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py b/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
index 785b1852338578693a389dbb410ae6e69b5b44e9..da71b1f871934005ae2c151baf87f51f20a33b21 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
index 8dcb026f109137ef9b73336bb865026c1eaf6e0f..4124675e8ac59cb3e54e6865dce8a05780b113ef 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py b/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
index bfe3e8ebaf1d93a2c9dbfca3d22a0642dd2d9784..1974c8cbf1833d12b95c481c4016722d0e9731df 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py b/cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py
index 202079b0be81557f7028537824ac976e7895f648..3cd0afb9cae5261ca3ad192b8be2abedd2b99263 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py b/cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py
index d20cda953c4c5a6ade540bc07b003d1be64de849..352d640a92ca8beef6e83ee82747d77c99f30361 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py b/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
index ddd86d32282188b9a78c64e12ad2394fe164866e..9c6aced6b11720b2b8507903b566bbe560696902 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py b/cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py
index 90cd67cd3bc0d589d3461f20569bd25269ffa46c..007a15db05b620758193fd822be084667099107d 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
index f23f4e07e2a1c714b5e0cb7341b037c3bc53afd1..a786c61485f2cc0323688845783ca78bd1f7320a 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
index 5b4a9f5e83ca910ec7aaa0cfbdd4344331165073..4c7f453e15934f716899e63b9b36d195da5a39dc 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
index db7fe0e32a28f0047cea7953c6ff0d06593bcee5..dddd9cc4c3a9437fa3842ae05639b01a560ab978 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/011_add_bootable_column.py b/cinder/db/sqlalchemy/migrate_repo/versions/011_add_bootable_column.py
index c4a5095b998c9e598647d7edb8f390bc24952be2..112764e5812963635fa031153f4bc73ce4952513 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/011_add_bootable_column.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/011_add_bootable_column.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/012_add_attach_host_column.py b/cinder/db/sqlalchemy/migrate_repo/versions/012_add_attach_host_column.py
index 821f969e662ca7c5a225d21990306a6cf795628d..58b03bcfc202f8a9e9fff5e7ab71ffebf196a6bd 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/012_add_attach_host_column.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/012_add_attach_host_column.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/013_add_provider_geometry_column.py b/cinder/db/sqlalchemy/migrate_repo/versions/013_add_provider_geometry_column.py
index c027992fa1a0f9a86dc78bbaa4c00e977b88a185..afc3b5b35c6c8d24a839250bcf4ce74389bb5f13 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/013_add_provider_geometry_column.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/013_add_provider_geometry_column.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/014_add_name_id.py b/cinder/db/sqlalchemy/migrate_repo/versions/014_add_name_id.py
index e3567473e17bbc8a17bca114586f281635a6b55d..4bf8bffff247c3d7c0faf09fa67e6ff8fe06c85b 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/014_add_name_id.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/014_add_name_id.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
index 75627b371be12a1c5042da1b1cb38306d7b14140..63848efaa2db012f8ca5f8aea402a03408f44672 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py b/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
index 2dabaa51ad259a9805c5fe1b56204009b9f55648..6dfb68ea21faee65f0f267516a5f96fa04a76a8e 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
index 1b9368cc9f75488645e9d8e374a53438bce9d075..4558667ff28f0126e33b71108dc6c93b180fde85 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
index c95d25e37957b851487d8ed52bcf55d5f0ecc26d..6957f5da0727d9a48f4e8cd54b557a216990f266 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (C) 2013 eBay Inc.
 # Copyright (C) 2013 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
index a226b55df253db3969acc890d3a415b238e4b201..f66f09ddee7c393c6ead6b19a3430d1edc612f92 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
@@ -1,5 +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
 #    a copy of the License at

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/022_add_reason_column_to_service.py b/cinder/db/sqlalchemy/migrate_repo/versions/022_add_reason_column_to_service.py
index a4b7df5f1ee825e00efee1525d1906939804aeb5..cc0288ee27822072cfc4f060fd9f16518ddd040c 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/022_add_reason_column_to_service.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/022_add_reason_column_to_service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/db/sqlalchemy/migration.py b/cinder/db/sqlalchemy/migration.py
index ebbb345804d3526ab459f573f7958ccb616dbdbb..ebfdff8cb119a7378aeafb7d4dc7660b8a7275e1 100644 (file)
--- a/cinder/db/sqlalchemy/migration.py
+++ b/cinder/db/sqlalchemy/migration.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/db/sqlalchemy/models.py b/cinder/db/sqlalchemy/models.py
index b21613f94894877d92966cd2dde6aaef0fa35bf3..5a29e6852db5f3f6f66d1816c2a7a4e07779f8ce 100644 (file)
--- a/cinder/db/sqlalchemy/models.py
+++ b/cinder/db/sqlalchemy/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/exception.py b/cinder/exception.py
index f8f23ee54cb2e0240e36e063dca4481769b7d733..0fe486992e9e718952f0fb2d399f70bfe26b6d05 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 641c337935b8058bcd0401199c56cc392311a7f9..dc38e29a4e317667584e4b95c94fbf6baaa394fc 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # Copyright 2013 NTT corp.
 # All Rights Reserved.

diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
index 540a7bdf30cc56a76a773fe8cb4f67000a60e9b3..e73e08e4bded9ebb562d609f24388eaafbe1f85d 100644 (file)
--- a/cinder/image/image_utils.py
+++ b/cinder/image/image_utils.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/keymgr/__init__.py b/cinder/keymgr/__init__.py
index f87e9f5b535c804aa406f84ae4befa39e557c5f2..84daca4e53ce1fba518908323f2d65b570e5247d 100644 (file)
--- a/cinder/keymgr/__init__.py
+++ b/cinder/keymgr/__init__.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/keymgr/conf_key_mgr.py b/cinder/keymgr/conf_key_mgr.py
index ee4fbc3f32c08d8c30900ad6f8555f2d470b488a..9915bfe576cc4801f4818e7fed6e0b15e468d7ee 100644 (file)
--- a/cinder/keymgr/conf_key_mgr.py
+++ b/cinder/keymgr/conf_key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/keymgr/key.py b/cinder/keymgr/key.py
index a5debac32498f740658c0560073b85b42aa129b2..54080ab64c43d9236245e74bc3f925a10907df82 100644 (file)
--- a/cinder/keymgr/key.py
+++ b/cinder/keymgr/key.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/keymgr/key_mgr.py b/cinder/keymgr/key_mgr.py
index b47c79e9055b97c1a2d4bad90c4c9569dfc85b12..4fb4f07bc057b409e12321d749d71a216f470532 100644 (file)
--- a/cinder/keymgr/key_mgr.py
+++ b/cinder/keymgr/key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/keymgr/not_implemented_key_mgr.py b/cinder/keymgr/not_implemented_key_mgr.py
index 52d6b384f6cbf55674ddc0a5a4c9d8c9fe43babb..60f6470296c46b92a65981e50d27687616858838 100644 (file)
--- a/cinder/keymgr/not_implemented_key_mgr.py
+++ b/cinder/keymgr/not_implemented_key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/manager.py b/cinder/manager.py
index d7cf41e2bc01d24fdb0796a8f75d60b0a7e35593..0ef53c01945f6dac8f36ee8d6092469dc2b49e97 100644 (file)
--- a/cinder/manager.py
+++ b/cinder/manager.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/policy.py b/cinder/policy.py
index 0d766e20bced453bf6435ed34906e1b02e70f81d..9e3999efaf796b0f93080e9f6fbeaf6f3c740615 100644 (file)
--- a/cinder/policy.py
+++ b/cinder/policy.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/quota.py b/cinder/quota.py
index b055705e7bfb96c2c34806437c5e1d89aac8a1fd..a38ff7cacdbbb131561100c612df12f7f9d71bb1 100644 (file)
--- a/cinder/quota.py
+++ b/cinder/quota.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/scheduler/__init__.py b/cinder/scheduler/__init__.py
index 0483b0a6e914460b8fb483f4b900d38bb41bb46b..a8101219914095a1934b89828f393fe99d9c90f8 100644 (file)
--- a/cinder/scheduler/__init__.py
+++ b/cinder/scheduler/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2010 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/scheduler/chance.py b/cinder/scheduler/chance.py
index 922a7ba5d6f6fe37b847876df3ba71c7064a9067..1287164664353190da0f69dd0b413e35aaa124c0 100644 (file)
--- a/cinder/scheduler/chance.py
+++ b/cinder/scheduler/chance.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2010 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
index 4a074f00ef256ecd533157b2779898086093e0a6..0dcd355f6806802f76cb28e85090b5044d02f3d7 100644 (file)
--- a/cinder/scheduler/driver.py
+++ b/cinder/scheduler/driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2010 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index 515ef8c135720d0446217ddc95571fc2541044bd..7093001742ed77c3b742138dcf29cf970da79654 100644 (file)
--- a/cinder/scheduler/manager.py
+++ b/cinder/scheduler/manager.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2010 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/scheduler/rpcapi.py b/cinder/scheduler/rpcapi.py
index 60fe5a67a9c2120aae0c52a248b0277faaa115a4..0ed7b2929f06dc0802980c69bdb77efd12e6e579 100644 (file)
--- a/cinder/scheduler/rpcapi.py
+++ b/cinder/scheduler/rpcapi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012, Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/scheduler/scheduler_options.py b/cinder/scheduler/scheduler_options.py
index 9cf9785686fff15cad69542d7f6be909a8d7aeb2..37484fe722b4780a3cb5eaea2f0058b556d39cd3 100644 (file)
--- a/cinder/scheduler/scheduler_options.py
+++ b/cinder/scheduler/scheduler_options.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/scheduler/simple.py b/cinder/scheduler/simple.py
index cb7dc4391894052c41fc0f5eac81b9ef6ad7d777..c376982359aa703a616d8ef463b276662a4d4870 100644 (file)
--- a/cinder/scheduler/simple.py
+++ b/cinder/scheduler/simple.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2010 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/cinder/service.py b/cinder/service.py
index 9d580324403fd0233628989eaca1b679fa25aa1c..02674f5cfee11b65a0f4eb63a7a496f14f134588 100644 (file)
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -1,5 +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.
 # Copyright 2011 Justin Santa Barbara

diff --git a/cinder/test.py b/cinder/test.py
index b572b369f082cb2754dfb2f75ebd17a8cf9eb6ba..fb8ee2b964bbe5eca03f55469115c0cbad6195ff 100644 (file)
--- a/cinder/test.py
+++ b/cinder/test.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/__init__.py b/cinder/tests/__init__.py
index cb73bd3a3cf50af428a28b808bad22ce2a2828f1..302a1a2dbabf6e99a3bb57262d52dde565ea32f2 100644 (file)
--- a/cinder/tests/__init__.py
+++ b/cinder/tests/__init__.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/api/__init__.py b/cinder/tests/api/__init__.py
index c22b04bf348ef79eeeae8b4a9c620134d7965ca8..a2c6e2e27d1cb44495736a67b64cf671ceb2aed2 100644 (file)
--- a/cinder/tests/api/__init__.py
+++ b/cinder/tests/api/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/common.py b/cinder/tests/api/common.py
index 5a0a72c0859a1b66c34afc5a2c4aa0d3e0fe29ae..c0ef6108158ebd09516d7eaa6c2b6e2db7281397 100644 (file)
--- a/cinder/tests/api/common.py
+++ b/cinder/tests/api/common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/contrib/__init__.py b/cinder/tests/api/contrib/__init__.py
index c22b04bf348ef79eeeae8b4a9c620134d7965ca8..a2c6e2e27d1cb44495736a67b64cf671ceb2aed2 100644 (file)
--- a/cinder/tests/api/contrib/__init__.py
+++ b/cinder/tests/api/contrib/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/contrib/test_hosts.py b/cinder/tests/api/contrib/test_hosts.py
index 12af06c9e14090e75f648c429d839553ad43bf5e..7f8c542b5931b352b0c2324a47132c6c3032ad03 100644 (file)
--- a/cinder/tests/api/contrib/test_hosts.py
+++ b/cinder/tests/api/contrib/test_hosts.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/contrib/test_quotas.py b/cinder/tests/api/contrib/test_quotas.py
index 312682d434029e9551b889db9655530aebec86a4..2b44ebe1f44809dae431f95de9042f33a1b351d7 100644 (file)
--- a/cinder/tests/api/contrib/test_quotas.py
+++ b/cinder/tests/api/contrib/test_quotas.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/api/contrib/test_quotas_classes.py b/cinder/tests/api/contrib/test_quotas_classes.py
index 662f6b15ef7064536d1a65bed452e58aff2cc50e..80cb26dde157049c51d12f0d8ad4718a48f4fa00 100644 (file)
--- a/cinder/tests/api/contrib/test_quotas_classes.py
+++ b/cinder/tests/api/contrib/test_quotas_classes.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 Huawei Technologies Co., Ltd
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/contrib/test_scheduler_hints.py b/cinder/tests/api/contrib/test_scheduler_hints.py
index c48d98dee72e5d70fc379c7f18864fd4098121f5..5f8728ba9fe5680ebe23aeeb07e22ff5bd93b47d 100644 (file)
--- a/cinder/tests/api/contrib/test_scheduler_hints.py
+++ b/cinder/tests/api/contrib/test_scheduler_hints.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/contrib/test_types_extra_specs.py b/cinder/tests/api/contrib/test_types_extra_specs.py
index 7c947e3aac0a2762b9536fa54670c563543eb65f..1cdc3ab3ece17f6e192b054bf3b073a63fc114fd 100644 (file)
--- a/cinder/tests/api/contrib/test_types_extra_specs.py
+++ b/cinder/tests/api/contrib/test_types_extra_specs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 # Copyright 2011 University of Southern California

diff --git a/cinder/tests/api/contrib/test_volume_actions.py b/cinder/tests/api/contrib/test_volume_actions.py
index 1a70daffd2a017c63594bbf492bde922c7c06155..c459fe1bcc141a330f168b360a08684d66d3060e 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_actions.py
+++ b/cinder/tests/api/contrib/test_volume_actions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #   Copyright 2012 OpenStack Foundation
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/api/contrib/test_volume_encryption_metadata.py b/cinder/tests/api/contrib/test_volume_encryption_metadata.py
index 8a2ed0616fda0719a83bae3aa1039fc33fad6dd2..5d321435b063f98c7d73ba51c7ca71559c175bfd 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_encryption_metadata.py
+++ b/cinder/tests/api/contrib/test_volume_encryption_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #
@@ -15,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 import json
 import webob
 

diff --git a/cinder/tests/api/contrib/test_volume_host_attribute.py b/cinder/tests/api/contrib/test_volume_host_attribute.py
index e850536a54a742aa970ab3c2dedcabeb16bd831c..1ff0aeee4e0225a3ed446f945f4b1a5818007f68 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_host_attribute.py
+++ b/cinder/tests/api/contrib/test_volume_host_attribute.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #   Copyright 2012 OpenStack Foundation
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/api/contrib/test_volume_image_metadata.py b/cinder/tests/api/contrib/test_volume_image_metadata.py
index f702aa423d4c47e5a80244f89f501ffc9d1a9a08..7520c7464f027f66b132ff8ba134ddb627abff94 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_image_metadata.py
+++ b/cinder/tests/api/contrib/test_volume_image_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #   Copyright 2012 OpenStack Foundation
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/api/contrib/test_volume_tenant_attribute.py b/cinder/tests/api/contrib/test_volume_tenant_attribute.py
index c63df146b76a426d1310af3d0ff1de5ce970824c..5323b741cc037e1f48f06a55ec98ef17cefe911c 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_tenant_attribute.py
+++ b/cinder/tests/api/contrib/test_volume_tenant_attribute.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #   Copyright 2012 OpenStack Foundation
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/api/contrib/test_volume_type_encryption.py b/cinder/tests/api/contrib/test_volume_type_encryption.py
index cb4cb0937b8164f555ea722262e1c25681330926..e2d2a1d93573ba5dd89d9957c926ae595ade17b3 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_type_encryption.py
+++ b/cinder/tests/api/contrib/test_volume_type_encryption.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #
@@ -15,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 import json
 import webob
 

diff --git a/cinder/tests/api/extensions/foxinsocks.py b/cinder/tests/api/extensions/foxinsocks.py
index 53ae39e88faf36178a764130a55c904246830acb..fcc9635d33e68e89fe9fc5d94f2284160c8dca73 100644 (file)
--- a/cinder/tests/api/extensions/foxinsocks.py
+++ b/cinder/tests/api/extensions/foxinsocks.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/fakes.py b/cinder/tests/api/fakes.py
index 08f494de6a15b4d97956facf276b543695245e80..db10d43a611ed4dd723f0ade53b612fed1bda7d3 100644 (file)
--- a/cinder/tests/api/fakes.py
+++ b/cinder/tests/api/fakes.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/middleware/test_faults.py b/cinder/tests/api/middleware/test_faults.py
index 790c8f6f8ce7d24eb6600def4109b6b67bd44ff2..882ed689512f91a1752bd384e1ebcd22a11abcd2 100644 (file)
--- a/cinder/tests/api/middleware/test_faults.py
+++ b/cinder/tests/api/middleware/test_faults.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/openstack/__init__.py b/cinder/tests/api/openstack/__init__.py
index c22b04bf348ef79eeeae8b4a9c620134d7965ca8..a2c6e2e27d1cb44495736a67b64cf671ceb2aed2 100644 (file)
--- a/cinder/tests/api/openstack/__init__.py
+++ b/cinder/tests/api/openstack/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/openstack/test_wsgi.py b/cinder/tests/api/openstack/test_wsgi.py
index 259911e57e3c2f295375cf115f64c58e48a84d91..4f8c9144f28ed400dd977b6dbdabce2e140778cf 100644 (file)
--- a/cinder/tests/api/openstack/test_wsgi.py
+++ b/cinder/tests/api/openstack/test_wsgi.py
@@ -1,5 +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
 # a copy of the License at

diff --git a/cinder/tests/api/test_common.py b/cinder/tests/api/test_common.py
index 214a50a6afbe9680eb4d6b78b9ef17b45366c793..12acc9b6bbf453d78e0c3a399e0678c1e9ee3ce0 100644 (file)
--- a/cinder/tests/api/test_common.py
+++ b/cinder/tests/api/test_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/test_extensions.py b/cinder/tests/api/test_extensions.py
index 1cbdfd81baf4d71929c0c5f30aa415387b137ecc..64acba42b1442b69de6f211893cad3a1b2930fe3 100644 (file)
--- a/cinder/tests/api/test_extensions.py
+++ b/cinder/tests/api/test_extensions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/api/test_wsgi.py b/cinder/tests/api/test_wsgi.py
index 9dbe8b16a8293491d52c217f25323216f3badabf..fc52fb9a51ba6f2ab31ecd62cc297dbc0c48da5f 100644 (file)
--- a/cinder/tests/api/test_wsgi.py
+++ b/cinder/tests/api/test_wsgi.py
@@ -1,5 +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.
 # Copyright 2010 OpenStack Foundation

diff --git a/cinder/tests/api/test_xmlutil.py b/cinder/tests/api/test_xmlutil.py
index 856a325fac6f86323c577f382a453f485b937d36..4c111e78fdbb969007cf28baf78e6e1124e8fc89 100644 (file)
--- a/cinder/tests/api/test_xmlutil.py
+++ b/cinder/tests/api/test_xmlutil.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/v1/stubs.py b/cinder/tests/api/v1/stubs.py
index 76db862db8d25706208ddb678c48119b85e01295..8f6883061c3e81d3c0b26e62c0c5c641ca7747e0 100644 (file)
--- a/cinder/tests/api/v1/stubs.py
+++ b/cinder/tests/api/v1/stubs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/v1/test_snapshot_metadata.py b/cinder/tests/api/v1/test_snapshot_metadata.py
index 65c4e0d69fcbea5a635bb9662f6cb9d12c947916..427d694eba00974b4edcdf58f3157386455a6585 100644 (file)
--- a/cinder/tests/api/v1/test_snapshot_metadata.py
+++ b/cinder/tests/api/v1/test_snapshot_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/v1/test_volume_metadata.py b/cinder/tests/api/v1/test_volume_metadata.py
index c6a6c1c6f2e0a775007fcd0ad6e22ee378682100..56d90b3036714a8ebf1ab3f442a8195ce129d495 100644 (file)
--- a/cinder/tests/api/v1/test_volume_metadata.py
+++ b/cinder/tests/api/v1/test_volume_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/v2/stubs.py b/cinder/tests/api/v2/stubs.py
index 18c2fb4f3546d8b68f1b03a6520b3dfc3844ebf5..a940db19f2e8eefe8e1bdef74662da0fab0f7c97 100644 (file)
--- a/cinder/tests/api/v2/stubs.py
+++ b/cinder/tests/api/v2/stubs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/v2/test_snapshot_metadata.py b/cinder/tests/api/v2/test_snapshot_metadata.py
index bcbbaa49b1a60ab30bf55c0e69ec5a3120e6ea21..8fc1b1f8fb0c542f557de84ea4f114896e059e3f 100644 (file)
--- a/cinder/tests/api/v2/test_snapshot_metadata.py
+++ b/cinder/tests/api/v2/test_snapshot_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/api/v2/test_volume_metadata.py b/cinder/tests/api/v2/test_volume_metadata.py
index 1ef807ba2be1df3b2f5ff4b0c2a0028410dc5590..51c1dad38a10e4582f3b78078c68bcbab35573ba 100644 (file)
--- a/cinder/tests/api/v2/test_volume_metadata.py
+++ b/cinder/tests/api/v2/test_volume_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation.
 # All Rights Reserved.
 #

diff --git a/cinder/tests/brick/test_brick_connector.py b/cinder/tests/brick/test_brick_connector.py
index a7b9b9c37a82eddeaa50ef8853d2042721f49a72..cd51588d3e3d3f28c6367c5fa321487144b4bec2 100644 (file)
--- a/cinder/tests/brick/test_brick_connector.py
+++ b/cinder/tests/brick/test_brick_connector.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/brick/test_brick_linuxfc.py b/cinder/tests/brick/test_brick_linuxfc.py
index 69f929c4f53b2166a6c07f62de30c720a36628bd..8e93ef71a271c7c8a8a7128606ab6f68cbe14dbe 100644 (file)
--- a/cinder/tests/brick/test_brick_linuxfc.py
+++ b/cinder/tests/brick/test_brick_linuxfc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/brick/test_brick_linuxscsi.py b/cinder/tests/brick/test_brick_linuxscsi.py
index 5fa80dff00b482c4f12eefac73184ce87fc8bde4..47b73dcfb1cf09a9b4adb12e5d7d10e09f6bb188 100644 (file)
--- a/cinder/tests/brick/test_brick_linuxscsi.py
+++ b/cinder/tests/brick/test_brick_linuxscsi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/brick/test_brick_lvm.py b/cinder/tests/brick/test_brick_lvm.py
index 6a6f3acb48923da70e2963fa9ee8616f80e31850..bbc0d3f95bcca78897b904dba854e94599b46a9e 100644 (file)
--- a/cinder/tests/brick/test_brick_lvm.py
+++ b/cinder/tests/brick/test_brick_lvm.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/brick/test_brick_remotefs.py b/cinder/tests/brick/test_brick_remotefs.py
index 7f2e954168eb651650f908134b8ad9a263da6ac6..322e97aeb36f574357177dd99d49b8c251369637 100644 (file)
--- a/cinder/tests/brick/test_brick_remotefs.py
+++ b/cinder/tests/brick/test_brick_remotefs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # (c) Copyright 2013 OpenStack Foundation
 # All Rights Reserved
 #

diff --git a/cinder/tests/conf_fixture.py b/cinder/tests/conf_fixture.py
index 841ec379124a4ca026814dd952a63da31e497c1c..7c73e621270c77d9ef9a1d7f8d4364889d64d813 100644 (file)
--- a/cinder/tests/conf_fixture.py
+++ b/cinder/tests/conf_fixture.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/db/__init__.py b/cinder/tests/db/__init__.py
index 2d43aac42ffa1db9f9ad6897b93d509b4a32a199..fdf33be94127834bee99a615dbf5be4131f2c402 100644 (file)
--- a/cinder/tests/db/__init__.py
+++ b/cinder/tests/db/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (c) 2010 Citrix Systems, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/db/fakes.py b/cinder/tests/db/fakes.py
index afd78854b858738e56276b34f64d738f878d9aef..90b90324cc9bd8e1157f1544cdbca181cf570eb5 100644 (file)
--- a/cinder/tests/db/fakes.py
+++ b/cinder/tests/db/fakes.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/declare_conf.py b/cinder/tests/declare_conf.py
index b9dc1ab2e73e75d80392df0cb701f57b8a09f304..a1974403316ccd473bc964967d5f19d79b3f32c7 100644 (file)
--- a/cinder/tests/declare_conf.py
+++ b/cinder/tests/declare_conf.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/fake_flags.py b/cinder/tests/fake_flags.py
index 3bf94ae21d2337969c22de0a158820788ceb1fa2..b5b85ea687f894ea1bea19d813d5c051078550db 100644 (file)
--- a/cinder/tests/fake_flags.py
+++ b/cinder/tests/fake_flags.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/fake_utils.py b/cinder/tests/fake_utils.py
index af586b882dae1eae3404073344cacebcdd227620..d7df676cf03555b3cfe22b8a8207cfcb345467b6 100644 (file)
--- a/cinder/tests/fake_utils.py
+++ b/cinder/tests/fake_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Citrix Systems, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/glance/__init__.py b/cinder/tests/glance/__init__.py
index ef9fa05a7ce86bc9f90c827a706f3c131ac37212..eac840c7edb8e85a1841aced1cf57ce5fe8d2a29 100644 (file)
--- a/cinder/tests/glance/__init__.py
+++ b/cinder/tests/glance/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (c) 2011 Citrix Systems, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/glance/stubs.py b/cinder/tests/glance/stubs.py
index 076afeffc9f087cd59344c393422db3f00ec97d6..9a1bbdd27d9d89e0ed8acc9f8d6c16ccb1a73da6 100644 (file)
--- a/cinder/tests/glance/stubs.py
+++ b/cinder/tests/glance/stubs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Citrix Systems, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/image/__init__.py b/cinder/tests/image/__init__.py
index f154defa40f7b40e5601c36c5e0b432e92f8ace8..9713c65addeff6121405407200e50bd8c8ba2c9b 100644 (file)
--- a/cinder/tests/image/__init__.py
+++ b/cinder/tests/image/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/image/fake.py b/cinder/tests/image/fake.py
index d0318f336aeb0f6ae7e21c4fa73997a3c6bf59d1..18cea571f74295516d5e87637915865529a58518 100644 (file)
--- a/cinder/tests/image/fake.py
+++ b/cinder/tests/image/fake.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/image/test_glance.py b/cinder/tests/image/test_glance.py
index 8a1ff9309e4532ce6c0b9ef0ebd3feac75bbceb9..3be3568ab4445b7e950cc43dd2c9c47a59a7ce39 100644 (file)
--- a/cinder/tests/image/test_glance.py
+++ b/cinder/tests/image/test_glance.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/integrated/__init__.py b/cinder/tests/integrated/__init__.py
index 7c17b5ad74acb44258e14ecacdeec9cf09ead0da..1870fd0a8fb67e2d727b70d440dad43a55960bee 100644 (file)
--- a/cinder/tests/integrated/__init__.py
+++ b/cinder/tests/integrated/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (c) 2011 Justin Santa Barbara
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/integrated/api/__init__.py b/cinder/tests/integrated/api/__init__.py
index 5798ab3d1e6dcff9fa86351d144b1815345baed3..6168280c2493dc09dbac5f33b2d94d63b7659c71 100644 (file)
--- a/cinder/tests/integrated/api/__init__.py
+++ b/cinder/tests/integrated/api/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (c) 2011 Justin Santa Barbara
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index ac53006c8f75603073296b278cd88e57f64e865c..c06827cc1f93964fcfc91b0147c8fd2a1dcd0d12 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (c) 2011 Justin Santa Barbara
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/integrated/integrated_helpers.py b/cinder/tests/integrated/integrated_helpers.py
index b2dc5e73980a3a88420a0b9554d54dc7d8e339be..ef9bb1b58aec606a4745cc1b98063e3e53c12dfc 100644 (file)
--- a/cinder/tests/integrated/integrated_helpers.py
+++ b/cinder/tests/integrated/integrated_helpers.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/tests/integrated/test_extensions.py b/cinder/tests/integrated/test_extensions.py
index 039ecbe13e52154663105927c3b8e4b86e44f0b9..de4cdcb3013190f2cb6a41a71da473fb297261b5 100644 (file)
--- a/cinder/tests/integrated/test_extensions.py
+++ b/cinder/tests/integrated/test_extensions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/tests/integrated/test_login.py b/cinder/tests/integrated/test_login.py
index 9c1515de82808b986cf37f830e1557b7003d64c8..ef4e1933372e25ae603e2302acbc1842a0839c20 100644 (file)
--- a/cinder/tests/integrated/test_login.py
+++ b/cinder/tests/integrated/test_login.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/tests/integrated/test_volumes.py b/cinder/tests/integrated/test_volumes.py
index 92c02196bf161c62aaf7aa365bcb451fb8e38c95..9bdc872dbf9b6c0c64408f8f8997410923632e39 100644 (file)
--- a/cinder/tests/integrated/test_volumes.py
+++ b/cinder/tests/integrated/test_volumes.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/tests/integrated/test_xml.py b/cinder/tests/integrated/test_xml.py
index 2017a89e3f0f626532d40ced58bcd45473d45dec..68c89dbc26c8cac7cd945a5b5db51b8f6eb13598 100644 (file)
--- a/cinder/tests/integrated/test_xml.py
+++ b/cinder/tests/integrated/test_xml.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/tests/keymgr/fake.py b/cinder/tests/keymgr/fake.py
index 84693413fcc1a43616fc1020043f21f787e13ca6..c169e0a4e07c0f024c3bef59214d9a039bcaef2d 100644 (file)
--- a/cinder/tests/keymgr/fake.py
+++ b/cinder/tests/keymgr/fake.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/keymgr/mock_key_mgr.py b/cinder/tests/keymgr/mock_key_mgr.py
index beeb376c267bfd56c8057000723593726ad0edb7..2b49c8b465549106171cd5ca3c581c262f9f4810 100644 (file)
--- a/cinder/tests/keymgr/mock_key_mgr.py
+++ b/cinder/tests/keymgr/mock_key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/tests/keymgr/test_conf_key_mgr.py b/cinder/tests/keymgr/test_conf_key_mgr.py
index eb846aafa7e1bbf39316c21219784f254ae1997a..d4ba38c47e7071927bd8d291fa27e919ef53eb50 100644 (file)
--- a/cinder/tests/keymgr/test_conf_key_mgr.py
+++ b/cinder/tests/keymgr/test_conf_key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/tests/keymgr/test_key.py b/cinder/tests/keymgr/test_key.py
index 1355164929a68ba5015117fa3196503cdce3d6f0..d37688ef29be47fa6df8db1e3dd1bf32289e2b27 100644 (file)
--- a/cinder/tests/keymgr/test_key.py
+++ b/cinder/tests/keymgr/test_key.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/tests/keymgr/test_key_mgr.py b/cinder/tests/keymgr/test_key_mgr.py
index 7179d408917eac09fc33f25a850a34b2f166430c..0c37ecd60d9ab838a7787ce7fac2c9878b8721df 100644 (file)
--- a/cinder/tests/keymgr/test_key_mgr.py
+++ b/cinder/tests/keymgr/test_key_mgr.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/tests/keymgr/test_mock_key_mgr.py b/cinder/tests/keymgr/test_mock_key_mgr.py
index 0cfdc0519c8ab772a55a84adf39c821750f1ccc4..d73b8ba2a3773d0f5758258abedb45a23b415bed 100644 (file)
--- a/cinder/tests/keymgr/test_mock_key_mgr.py
+++ b/cinder/tests/keymgr/test_mock_key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/tests/keymgr/test_not_implemented_key_mgr.py b/cinder/tests/keymgr/test_not_implemented_key_mgr.py
index 6d60d90c0911b6252f56e09c1bbeb9bf8e784416..18493964700f6746e779b320a6c41a20daa008b9 100644 (file)
--- a/cinder/tests/keymgr/test_not_implemented_key_mgr.py
+++ b/cinder/tests/keymgr/test_not_implemented_key_mgr.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2013 The Johns Hopkins University/Applied Physics Laboratory
 # All Rights Reserved.
 #

diff --git a/cinder/tests/monkey_patch_example/__init__.py b/cinder/tests/monkey_patch_example/__init__.py
index 4903cdb100bd0aa80368226f737869c2c395a411..d367a484945790505eee46bbc28e4fbe067a0bca 100644 (file)
--- a/cinder/tests/monkey_patch_example/__init__.py
+++ b/cinder/tests/monkey_patch_example/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/monkey_patch_example/example_a.py b/cinder/tests/monkey_patch_example/example_a.py
index ae852a4068deb2be992f0c2bcd96ef7e1b341776..3fdb4dcc0562ca4c51ef7e0d5284b01ab4b8da61 100644 (file)
--- a/cinder/tests/monkey_patch_example/example_a.py
+++ b/cinder/tests/monkey_patch_example/example_a.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/monkey_patch_example/example_b.py b/cinder/tests/monkey_patch_example/example_b.py
index 8a171834b0180116d97515f5200663386484f685..2515fd2be4b90264c927db1cd75ed3f33064063e 100644 (file)
--- a/cinder/tests/monkey_patch_example/example_b.py
+++ b/cinder/tests/monkey_patch_example/example_b.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/runtime_conf.py b/cinder/tests/runtime_conf.py
index 7a9cfb6aaa0a1c398ae7238b0e940406380d5797..db1a6c5b713aa7ecf15caa6bc6f52d118e0bb4fe 100644 (file)
--- a/cinder/tests/runtime_conf.py
+++ b/cinder/tests/runtime_conf.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/scheduler/__init__.py b/cinder/tests/scheduler/__init__.py
index c22b04bf348ef79eeeae8b4a9c620134d7965ca8..a2c6e2e27d1cb44495736a67b64cf671ceb2aed2 100644 (file)
--- a/cinder/tests/scheduler/__init__.py
+++ b/cinder/tests/scheduler/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/scheduler/test_rpcapi.py b/cinder/tests/scheduler/test_rpcapi.py
index 838546482c96057ad6c5b8bdbea951403e8114de..49d13bfcbfde0605774160938ee817ec7bc6d393 100644 (file)
--- a/cinder/tests/scheduler/test_rpcapi.py
+++ b/cinder/tests/scheduler/test_rpcapi.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2012, Red Hat, Inc.
 #

diff --git a/cinder/tests/scheduler/test_scheduler.py b/cinder/tests/scheduler/test_scheduler.py
index 0b3ade1fb538005309888f369de0fdb79d2d0111..4a8df9afd8db11761a0db203d05d7c311f631822 100644 (file)
--- a/cinder/tests/scheduler/test_scheduler.py
+++ b/cinder/tests/scheduler/test_scheduler.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/cinder/tests/test_api.py b/cinder/tests/test_api.py
index 4397b5b4e5136c7b592bd2f16577dfa167b9bc6a..ad6e051c0c4c97eb2042e4b95948b7332c43946b 100644 (file)
--- a/cinder/tests/test_api.py
+++ b/cinder/tests/test_api.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/cinder/tests/test_conf.py b/cinder/tests/test_conf.py
index bacef2a8d1b98b76a5822ffb44621c4c3d6c80cf..c4f0ef9a2fab8ae4c1f6278b9a32ffba2dbdd565 100644 (file)
--- a/cinder/tests/test_conf.py
+++ b/cinder/tests/test_conf.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/cinder/tests/test_context.py b/cinder/tests/test_context.py
index 6725594133c882ca612923fc4c6ceab9f8ae1ce5..81afed73fe0ebba50ddd4f698013e5431bf13790 100644 (file)
--- a/cinder/tests/test_context.py
+++ b/cinder/tests/test_context.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #    Copyright 2011 OpenStack Foundation
 #

diff --git a/cinder/tests/test_coraid.py b/cinder/tests/test_coraid.py
index 0c9bd96e462401d174a3a6a0a0daa88ef3a2fcd2..52e2564a927dac7d7aa6e4e1520ccdb223a9a050 100644 (file)
--- a/cinder/tests/test_coraid.py
+++ b/cinder/tests/test_coraid.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/test_emc.py b/cinder/tests/test_emc.py
index d3161f567f5878bd3e4e1d3587a9a59ce69c8f64..d7bd2801794db2e97a8459214b95df118eb89c85 100644 (file)
--- a/cinder/tests/test_emc.py
+++ b/cinder/tests/test_emc.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2012 EMC Corporation, Inc.
 # Copyright (c) 2012 OpenStack Foundation

diff --git a/cinder/tests/test_exception.py b/cinder/tests/test_exception.py
index 2a22a7a834a807b8818ba2841ece67d57fecfb8b..f4c5f4800282cd681b1ae38b1c21c75d7bf91b72 100644 (file)
--- a/cinder/tests/test_exception.py
+++ b/cinder/tests/test_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/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py
index 565d3363d002f9bfe807ec039107640c452ed7e3..23874a9b4cdc40e1b067d11ba92e86ba158c398c 100644 (file)
--- a/cinder/tests/test_glusterfs.py
+++ b/cinder/tests/test_glusterfs.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2013 Red Hat, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_gpfs.py b/cinder/tests/test_gpfs.py
index 97c9b3dd9e670197b0ae6e2feab73e20be1cf8c4..f9ecc348591d9c66f1bc3aee20a6b3fb13a64fc9 100644 (file)
--- a/cinder/tests/test_gpfs.py
+++ b/cinder/tests/test_gpfs.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright IBM Corp. 2013 All Rights Reserved
 #

diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py
index 8034bca00d57f585a0322344f42e5e41fdf33360..890b207cc4e751670598a86d03081a6bb96b140b 100644 (file)
--- a/cinder/tests/test_hp3par.py
+++ b/cinder/tests/test_hp3par.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.

diff --git a/cinder/tests/test_huawei_hvs.py b/cinder/tests/test_huawei_hvs.py
index be24ba56a11b4c225a9092185ceeb7008e7c4682..1974ce00028e335c467a7730fbc574d863a38d35 100644 (file)
--- a/cinder/tests/test_huawei_hvs.py
+++ b/cinder/tests/test_huawei_hvs.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2013 OpenStack Foundation

diff --git a/cinder/tests/test_huawei_t_dorado.py b/cinder/tests/test_huawei_t_dorado.py
index 31caa97e315bce480636b2aebbe543b25e1c642b..97d963eaa4e4c3ef9571fe4dbaab94dae89c00ff 100644 (file)
--- a/cinder/tests/test_huawei_t_dorado.py
+++ b/cinder/tests/test_huawei_t_dorado.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2012 OpenStack Foundation

diff --git a/cinder/tests/test_image_utils.py b/cinder/tests/test_image_utils.py
index f8aac33a38aa397ba3ddbc72905bfc49230a4146..03c4dcb400a56b421f1ceb8094e746774d4a5102 100644 (file)
--- a/cinder/tests/test_image_utils.py
+++ b/cinder/tests/test_image_utils.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2013 eNovance , Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_iscsi.py b/cinder/tests/test_iscsi.py
index 6d42ac037c82d5034ea6d6300a8b55acd49d9294..f07c8a4f6b8f07dd41a65a5b7ca2f63ebb9bf8b9 100644 (file)
--- a/cinder/tests/test_iscsi.py
+++ b/cinder/tests/test_iscsi.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 Red Hat, Inc.
 #

diff --git a/cinder/tests/test_migrations.py b/cinder/tests/test_migrations.py
index e55eba95ae50251062a46883a007b56b38c38720..58e2355d41ccbcad45cd707f86d6d5901c73e192 100644 (file)
--- a/cinder/tests/test_migrations.py
+++ b/cinder/tests/test_migrations.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/test_misc.py b/cinder/tests/test_misc.py
index 686f2b61413dbc094fe070effb513b022b23bc3c..548b9646e552c413189a6a532e8b9c8583fefa6d 100644 (file)
--- a/cinder/tests/test_misc.py
+++ b/cinder/tests/test_misc.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #    Copyright 2010 OpenStack Foundation
 #

diff --git a/cinder/tests/test_netapp.py b/cinder/tests/test_netapp.py
index 6534325f022fbfeb86fa6cc299776b7909ef075d..bad9fc85f7a98e85140bc5d9d7ec1f396d251fc3 100644 (file)
--- a/cinder/tests/test_netapp.py
+++ b/cinder/tests/test_netapp.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2012 NetApp, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_netapp_nfs.py b/cinder/tests/test_netapp_nfs.py
index 7105a8fa955f7c207e0222ff7eb44321453f1c98..e909b5d095971622ed71e6c49ad181f0205ad2e7 100644 (file)
--- a/cinder/tests/test_netapp_nfs.py
+++ b/cinder/tests/test_netapp_nfs.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2012 NetApp, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_netapp_ssc.py b/cinder/tests/test_netapp_ssc.py
index b7de142f90cde5d24fde083c6e677b49164a62c2..99211269ccfd11e82b826ccf4a1defdb92fabfb3 100644 (file)
--- a/cinder/tests/test_netapp_ssc.py
+++ b/cinder/tests/test_netapp_ssc.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2012 NetApp, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_nexenta.py b/cinder/tests/test_nexenta.py
index cfc0146091884b2fe31517947bdf60ee465f2176..bc3da91e3adf05e0bfc784220ce3e556403afc3f 100644 (file)
--- a/cinder/tests/test_nexenta.py
+++ b/cinder/tests/test_nexenta.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2011 Nexenta Systems, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py
index 191aad59ba8e34126efa44fbd36a1df77e0c7da8..b37cb6932a448c58bc4308b42fdc9b7a89926388 100644 (file)
--- a/cinder/tests/test_nfs.py
+++ b/cinder/tests/test_nfs.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2012 NetApp, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_policy.py b/cinder/tests/test_policy.py
index 3401dfbebae987f2812ce66b6217068c60a07a41..e900f1306a707440e247fa0e3379402720b3d029 100644 (file)
--- a/cinder/tests/test_policy.py
+++ b/cinder/tests/test_policy.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 Piston Cloud Computing, Inc.
 # All Rights Reserved.

diff --git a/cinder/tests/test_qos_specs.py b/cinder/tests/test_qos_specs.py
index c7c75e10db294ab6e57d00c18c6119bec57b0be2..b147e235d3b9efffaec238f6b07ca891d8bac1b0 100644 (file)
--- a/cinder/tests/test_qos_specs.py
+++ b/cinder/tests/test_qos_specs.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2013 eBay Inc.
 # Copyright (c) 2013 OpenStack Foundation

diff --git a/cinder/tests/test_quota.py b/cinder/tests/test_quota.py
index 8db16a5dbeae76be95b38e292c93ca27f02cf34b..d6bdb3734d64face6be18cec7a83b9e8925269ca 100644 (file)
--- a/cinder/tests/test_quota.py
+++ b/cinder/tests/test_quota.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/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py
index e27e686d3c818891bd38c288e2334a1658942b93..50f8dc972e330d835e81e951a959486f5a2e1fce 100644 (file)
--- a/cinder/tests/test_rbd.py
+++ b/cinder/tests/test_rbd.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2012 Josh Durgin
 # All Rights Reserved.

diff --git a/cinder/tests/test_service.py b/cinder/tests/test_service.py
index 29ac18e22c9d3486a668b44cbd8b6ed442e7b467..60457217d47c562b83448a17ff4bfbe20f78ceb5 100644 (file)
--- a/cinder/tests/test_service.py
+++ b/cinder/tests/test_service.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/cinder/tests/test_sheepdog.py b/cinder/tests/test_sheepdog.py
index 052b7fe95ad6ea750cdc9c8af6861e166fa7970e..3f8e93b76231715ed701d6581d200d9f1195191e 100644 (file)
--- a/cinder/tests/test_sheepdog.py
+++ b/cinder/tests/test_sheepdog.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2013 Zelin.io
 # All Rights Reserved.

diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py
index 48f8ef241179e6812853d920eadcdc2c69d71b6c..1a46bc5f58b0969fa78068782708b55c8a8cf115 100644 (file)
--- a/cinder/tests/test_solidfire.py
+++ b/cinder/tests/test_solidfire.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/test_test.py b/cinder/tests/test_test.py
index be17f391679e205c12df0d7c13f00acf365c1864..b4c1af7abba013aed03d6d7702635ecf50195310 100644 (file)
--- a/cinder/tests/test_test.py
+++ b/cinder/tests/test_test.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/cinder/tests/test_test_utils.py b/cinder/tests/test_test_utils.py
index f6ca47c1f3bb80844556fbda136250ac777a04aa..6887913d775c165af1d5db55830e110c9bf6a407 100644 (file)
--- a/cinder/tests/test_test_utils.py
+++ b/cinder/tests/test_test_utils.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 #    Copyright 2010 OpenStack Foundation
 #

diff --git a/cinder/tests/test_utils.py b/cinder/tests/test_utils.py
index fb0a5287863d6fb66f9ebf177a5b8200a2b46378..380c13522267a796316d9671eee38b6908a0f7fb 100644 (file)
--- a/cinder/tests/test_utils.py
+++ b/cinder/tests/test_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2011 Justin Santa Barbara
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/test_vmware_vmdk.py b/cinder/tests/test_vmware_vmdk.py
index 188f2c1764aabab2f3e3e38c0dd41b461336d836..49b8643571e20e09632fc301f57ec01b671ab766 100644 (file)
--- a/cinder/tests/test_vmware_vmdk.py
+++ b/cinder/tests/test_vmware_vmdk.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index 9cb55224610ba18c90cc64aa932f140c06916bfe..62a529dd34455c836c756239fdac1f38e94ce79d 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/test_volume_configuration.py b/cinder/tests/test_volume_configuration.py
index d744c7718b4fd0b8033e0b11138b0d8c417168c7..63b33b33c940b6bc1ade2445d86b5de1862fb8fe 100644 (file)
--- a/cinder/tests/test_volume_configuration.py
+++ b/cinder/tests/test_volume_configuration.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright (c) 2012 Rackspace Hosting
 # All Rights Reserved.
 #

diff --git a/cinder/tests/test_volume_glance_metadata.py b/cinder/tests/test_volume_glance_metadata.py
index 1ee09a81f4ef8a635aec7803512e7e47edba1b7e..a3578730c224206d0a1a7a87428d01e98aba9fb1 100644 (file)
--- a/cinder/tests/test_volume_glance_metadata.py
+++ b/cinder/tests/test_volume_glance_metadata.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 # Copyright 2011 University of Southern California

diff --git a/cinder/tests/test_volume_rpcapi.py b/cinder/tests/test_volume_rpcapi.py
index 1a596bb83a4cf3c619b47ef7b1310380176e2806..f755dd83a895c2c7268c27135d1939129299fb9e 100644 (file)
--- a/cinder/tests/test_volume_rpcapi.py
+++ b/cinder/tests/test_volume_rpcapi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012, Intel, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/test_volume_transfer.py b/cinder/tests/test_volume_transfer.py
index 4fdb487bb60cae3906dd475eaf7cc54f8c6e029e..52e47d89c455817c21975c8e621c24b62e3c4824 100644 (file)
--- a/cinder/tests/test_volume_transfer.py
+++ b/cinder/tests/test_volume_transfer.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 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

diff --git a/cinder/tests/test_volume_types.py b/cinder/tests/test_volume_types.py
index b8aebd31a1e4ea705cc07b61ed1879287658cfe2..45743990b1f20d665e1792638f34ea5451465b5a 100644 (file)
--- a/cinder/tests/test_volume_types.py
+++ b/cinder/tests/test_volume_types.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/test_volume_types_extra_specs.py b/cinder/tests/test_volume_types_extra_specs.py
index bec28306994409eae6ca7ce8ef8a542819a0314c..bb8268ca1c54d668fe963f6ab18951aeb9aa7b2c 100644 (file)
--- a/cinder/tests/test_volume_types_extra_specs.py
+++ b/cinder/tests/test_volume_types_extra_specs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 # Copyright 2011 University of Southern California

diff --git a/cinder/tests/test_volume_utils.py b/cinder/tests/test_volume_utils.py
index ac3b4e52bd627032c3af870312304aa212591f5b..727647ff217cb18d652a90ec782c3c36237c135b 100644 (file)
--- a/cinder/tests/test_volume_utils.py
+++ b/cinder/tests/test_volume_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #

diff --git a/cinder/tests/test_windows.py b/cinder/tests/test_windows.py
index 0329b9f7ed4116cd428825ddfcef20a3a6646ced..0aa8d80e9e1383b7717ff415cac6d4976c965e79 100644 (file)
--- a/cinder/tests/test_windows.py
+++ b/cinder/tests/test_windows.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Pedro Navarro Perez
 # All Rights Reserved.
 #

diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py
index 8b7545c5432c428eddd22fb059d87efd2f4ce4ab..ce0ac9776ec5f977bf77b333e5f9c4b81d64782c 100644 (file)
--- a/cinder/tests/test_wsgi.py
+++ b/cinder/tests/test_wsgi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.

diff --git a/cinder/tests/test_xenapi_sm.py b/cinder/tests/test_xenapi_sm.py
index 829d6d407b44eab398b5b0d98fdb530c74627745..e9df123c242979a67b757a30d763424a57b16a7c 100644 (file)
--- a/cinder/tests/test_xenapi_sm.py
+++ b/cinder/tests/test_xenapi_sm.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/tests/test_xiv_ds8k.py b/cinder/tests/test_xiv_ds8k.py
index 68fbf40d833c8d1ed8300822d922915afa63f383..f02509126be8527c9129bed56a1436cc28908771 100644 (file)
--- a/cinder/tests/test_xiv_ds8k.py
+++ b/cinder/tests/test_xiv_ds8k.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # Copyright (c) 2013 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/test_zadara.py b/cinder/tests/test_zadara.py
index 379342a70e5df10e2a4833dcc365aa139a2f7a52..2dd23930275075f6d347f8c2115d448770d9c97c 100644 (file)
--- a/cinder/tests/test_zadara.py
+++ b/cinder/tests/test_zadara.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 Zadara Storage, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/tests/utils.py b/cinder/tests/utils.py
index b6fdf69f084f5f13947f725455c656ea08c4538d..f293e04c0d87110f31ee7c818bfefb906213dbb7 100644 (file)
--- a/cinder/tests/utils.py
+++ b/cinder/tests/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    Copyright 2011 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/tests/windows/db_fakes.py b/cinder/tests/windows/db_fakes.py
index 45d5c07c272555f3c35ec599bd29ef5ee30f081d..8442c2c9b44119ed50637b6e96ab0ef75412e445 100644 (file)
--- a/cinder/tests/windows/db_fakes.py
+++ b/cinder/tests/windows/db_fakes.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #  Copyright 2012 Pedro Navarro Perez
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/units.py b/cinder/units.py
index 7943476628f8d301a7ca9fe0380b0c6814cec864..23e92a336ea862170bea00911153fc9e47027766 100644 (file)
--- a/cinder/units.py
+++ b/cinder/units.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2011 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/utils.py b/cinder/utils.py
index c9ee4d427af0019fb03c15e404bd9d95743018ae..bcda10469ecf3349d577e58d1ce513dd99bdd596 100644 (file)
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -1,5 +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.
 # Copyright 2011 Justin Santa Barbara

diff --git a/cinder/version.py b/cinder/version.py
index 09d1ee341a6368482cb6b60758672888775abc0e..e3dbd70d7fc67dd6d8196e2b2bed5e7e3954f0dd 100644 (file)
--- a/cinder/version.py
+++ b/cinder/version.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2011 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/volume/__init__.py b/cinder/volume/__init__.py
index 40cb71bbbd87ea6efae494588c0456253981d258..e845ea618e98b16d0eb0d5e55f9805a9acabdfb1 100644 (file)
--- a/cinder/volume/__init__.py
+++ b/cinder/volume/__init__.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 90a41242f09a326f82c3026ef888497ab16769df..d535c6ed3e79c15277d5a689dc0c03ae03d399fe 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/configuration.py b/cinder/volume/configuration.py
index ef1baba077e1c90eb9b36e67eee6ce33209d57f8..2599ee9ad9f462cd381901416083619bba2ed3ff 100644 (file)
--- a/cinder/volume/configuration.py
+++ b/cinder/volume/configuration.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright (c) 2012 Rackspace Hosting
 # All Rights Reserved.
 #

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index ae7f6977eec8c6f65446fd26462689a93352e2cd..f33d012ead6f894355b7ee56b278e6ad395bfd17 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index b05dd8187a2b08faaeaa8b79a0346bfe2c835313..8bbf0c872ed2976527227e5a4daf287c82819e9b 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2012 Alyseo.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/cinder/volume/drivers/emc/emc_smis_common.py
index b1469c90396f70b607a84900af7fcb0d7af66388..2a0de7528843fc24ba7d43f1ec4812b7bc3195f5 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_common.py
+++ b/cinder/volume/drivers/emc/emc_smis_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 EMC Corporation.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/emc/emc_smis_iscsi.py b/cinder/volume/drivers/emc/emc_smis_iscsi.py
index 7809843ba307eca48f379b75fa51e5c7007ef5e3..550d64ed4c8c6679cf71156979b6380a8270de57 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_iscsi.py
+++ b/cinder/volume/drivers/emc/emc_smis_iscsi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 EMC Corporation.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index 0cc82afe8f356a9af9e8df5451842067705f37ca..9279692169ceca49aa721598ca60c169070f39b8 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Red Hat, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/gpfs.py b/cinder/volume/drivers/gpfs.py
index 4b23d8450f92cf007c4ee6312cbbbd19187b142b..e965b8df322101d11479441e307b614310f8c06a 100644 (file)
--- a/cinder/volume/drivers/gpfs.py
+++ b/cinder/volume/drivers/gpfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright IBM Corp. 2013 All Rights Reserved
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/volume/drivers/huawei/__init__.py b/cinder/volume/drivers/huawei/__init__.py
index 2d923ceba5f0a2d4394dda63f765eaaa1fe5df64..a71bfbbd801dcfcfe326e452d31169559ac5ee88 100644 (file)
--- a/cinder/volume/drivers/huawei/__init__.py
+++ b/cinder/volume/drivers/huawei/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/huawei/huawei_dorado.py b/cinder/volume/drivers/huawei/huawei_dorado.py
index ab9d75319a427be3119c4c0d38b6209ff9105012..3534ff084a41d2b1482f0e8a3d08eef7ede97306 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_dorado.py
+++ b/cinder/volume/drivers/huawei/huawei_dorado.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/huawei/huawei_hvs.py b/cinder/volume/drivers/huawei/huawei_hvs.py
index 0d70948ddeaff36635d407ddda6cfb672c74c486..afaf2ca728fccc538d5b4a8dcc1b9e470a49ed4b 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_hvs.py
+++ b/cinder/volume/drivers/huawei/huawei_hvs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2013 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/huawei/huawei_t.py b/cinder/volume/drivers/huawei/huawei_t.py
index 68551752dd4e6e272042dc30cad304f5d3e0c142..523c16f6ddefd3e2875d7a404c7aab1cfa23444e 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_t.py
+++ b/cinder/volume/drivers/huawei/huawei_t.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/huawei/huawei_utils.py b/cinder/volume/drivers/huawei/huawei_utils.py
index 97c3aa82d5874e823981b475e91e157bb3628978..8366c14a44d548c66412e72a716c76cb0307d503 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_utils.py
+++ b/cinder/volume/drivers/huawei/huawei_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2012 OpenStack LLC.
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/huawei/rest_common.py b/cinder/volume/drivers/huawei/rest_common.py
index ad2e8baa93b8b67304493104879027d41b6651fc..1bcbb40f362b214ec49eaf6ccad597d12e5c285b 100644 (file)
--- a/cinder/volume/drivers/huawei/rest_common.py
+++ b/cinder/volume/drivers/huawei/rest_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2013 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/huawei/ssh_common.py b/cinder/volume/drivers/huawei/ssh_common.py
index b56e78a1a3ee38f73dcd5c146affe2421fcba2b6..5e44aefc96cb46ad7edcef88a1851f390fe0ce3d 100644 (file)
--- a/cinder/volume/drivers/huawei/ssh_common.py
+++ b/cinder/volume/drivers/huawei/ssh_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Huawei Technologies Co., Ltd.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index 48557c0e5186cb4d214f9ad7c9073700f9331d28..668726d216dffcbfc183b88b3bb4007df29e0f5b 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/netapp/api.py b/cinder/volume/drivers/netapp/api.py
index 368b7f821955aaea088012bdbed14519720f8eeb..640ec65556fcf7e2275fc3f87ef782e98dc266a4 100644 (file)
--- a/cinder/volume/drivers/netapp/api.py
+++ b/cinder/volume/drivers/netapp/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/netapp/common.py b/cinder/volume/drivers/netapp/common.py
index 956b8d7bf07126ad43e9d2b5d2fb2dd0538b9ced..969414b14ee77198979ded9c1348d5f77480babc 100644 (file)
--- a/cinder/volume/drivers/netapp/common.py
+++ b/cinder/volume/drivers/netapp/common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/netapp/iscsi.py b/cinder/volume/drivers/netapp/iscsi.py
index 1ccdc30f8fd6d6c10bbf8e7b43cc8b69bb1cb9c0..50581cf898a7cf277303c402b67b4046569affee 100644 (file)
--- a/cinder/volume/drivers/netapp/iscsi.py
+++ b/cinder/volume/drivers/netapp/iscsi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py
index f3c01d376db321f336a4b990f422b75b47e2d335..79bb1d99251e26d9573c7c41c22f2f7c396e582e 100644 (file)
--- a/cinder/volume/drivers/netapp/nfs.py
+++ b/cinder/volume/drivers/netapp/nfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/netapp/options.py b/cinder/volume/drivers/netapp/options.py
index 0f922bd6698e5e1df897f2457bb1013d7c53c07e..644dbb2569ffab889d369e9bdc51b84f514dbca8 100644 (file)
--- a/cinder/volume/drivers/netapp/options.py
+++ b/cinder/volume/drivers/netapp/options.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/netapp/ssc_utils.py b/cinder/volume/drivers/netapp/ssc_utils.py
index 3f8c3eeddf7bf348b34aee34f61a82e8a8788f0a..76385dd9acd8b3dae31025a1d7b5037f52636ff8 100644 (file)
--- a/cinder/volume/drivers/netapp/ssc_utils.py
+++ b/cinder/volume/drivers/netapp/ssc_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/netapp/utils.py b/cinder/volume/drivers/netapp/utils.py
index 0f8d2e9294ef8e8776e212dd69e8a4c4a2545787..6bdd3d63244b3ba60d0e729d67cf7390cda89b27 100644 (file)
--- a/cinder/volume/drivers/netapp/utils.py
+++ b/cinder/volume/drivers/netapp/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/nexenta/__init__.py b/cinder/volume/drivers/nexenta/__init__.py
index a0a559374c68f725c2736fe426ab95037dbeeeb8..16f48bd877e472277a82a3f2d79ee80efe78d6a3 100644 (file)
--- a/cinder/volume/drivers/nexenta/__init__.py
+++ b/cinder/volume/drivers/nexenta/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2011 Nexenta Systems, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/nexenta/iscsi.py b/cinder/volume/drivers/nexenta/iscsi.py
index 3ca50948e3f6db1cd6dfa3fcbfad99e41d3dc0a7..f80dda0c90a408eca7317a7c8534146a1b462b37 100644 (file)
--- a/cinder/volume/drivers/nexenta/iscsi.py
+++ b/cinder/volume/drivers/nexenta/iscsi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2011 Nexenta Systems, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/nexenta/jsonrpc.py b/cinder/volume/drivers/nexenta/jsonrpc.py
index ed2d20a8d9500bce41e4c19a62d4d33de5e80f8b..58ee4af26a4f0e395698f80efdeb1754740f53a8 100644 (file)
--- a/cinder/volume/drivers/nexenta/jsonrpc.py
+++ b/cinder/volume/drivers/nexenta/jsonrpc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2011 Nexenta Systems, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py
index 53b9832e56fceab8b301ba8c7147b971af52d363..d20cbf48f25871e414976713b7d4b35ad5b90ba7 100644 (file)
--- a/cinder/volume/drivers/nexenta/nfs.py
+++ b/cinder/volume/drivers/nexenta/nfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 Nexenta Systems, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/nexenta/options.py b/cinder/volume/drivers/nexenta/options.py
index 8a04d4242da9507792fcdf663caf320ac95fa021..516349f4b712188eaeaa1ecdfcacf39775089420 100644 (file)
--- a/cinder/volume/drivers/nexenta/options.py
+++ b/cinder/volume/drivers/nexenta/options.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 Nexenta Systems, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/nexenta/utils.py b/cinder/volume/drivers/nexenta/utils.py
index 4fa9f22fb4842984347c21b5a25ef5574c7d8e57..375835c0d61bcc1fb1bb7ec22a7bc0941ef64709 100644 (file)
--- a/cinder/volume/drivers/nexenta/utils.py
+++ b/cinder/volume/drivers/nexenta/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # Copyright 2013 Nexenta Systems, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index 4e0371b72a62d273751bf4657656f2d617760890..bcc8e1420abfb54787ea4687e13ac427c32bd439 100644 (file)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 NetApp, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 34282d1069c98b77201107c85e79f0dfd1a9ec1a..3c19447c3c92e9d69d1c76bc408647417a01a952 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/san/hp/hp_3par_fc.py b/cinder/volume/drivers/san/hp/hp_3par_fc.py
index e404f998dc305363225bff742840df51bf5c7caf..8029ec5f167ea7e4345fbedc7768b9258e7346f3 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_fc.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_fc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py b/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
index be4e0b1483e58f88a1a8de2785b4e6ca44a433f5..26bbe92c8c3f983569ff7eeedc49603fc04d7edc 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index ce3c1fdb4a3645c6a57c7f2678610a705624a4b5..45ef69f00dd64b050d1fb10f7526b733af1c68dc 100644 (file)
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index 6fd28bb57004d82c20f75b4bf5e26a355a52c50b..275a559a1e5b280f20580e83723f129e2d97d99f 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 SolidFire Inc
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/storwize_svc.py b/cinder/volume/drivers/storwize_svc.py
index 862c4e1232838ac48c93f38a5c115173655f6f0a..547f38ebde546ccaf50c597ce8c8e3ff1e904230 100644 (file)
--- a/cinder/volume/drivers/storwize_svc.py
+++ b/cinder/volume/drivers/storwize_svc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/vmware/error_util.py b/cinder/volume/drivers/vmware/error_util.py
index 7cd8ba8ec57d428874b3f0f61ecbb596f2917e53..0be99d95391734a4e1b38bcfe1f27facb173f855 100644 (file)
--- a/cinder/volume/drivers/vmware/error_util.py
+++ b/cinder/volume/drivers/vmware/error_util.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/io_util.py b/cinder/volume/drivers/vmware/io_util.py
index 61a47aa472167a99ae2af654817ab218e93f6260..35be2fc4e480bf2af306369dc5d2b548af2a3bb4 100644 (file)
--- a/cinder/volume/drivers/vmware/io_util.py
+++ b/cinder/volume/drivers/vmware/io_util.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/read_write_util.py b/cinder/volume/drivers/vmware/read_write_util.py
index 2428d533b7c55d67a38d318464d9f73ec45869c0..37263c0ddd0f0e0b2614096d4bf5f4da5035b593 100644 (file)
--- a/cinder/volume/drivers/vmware/read_write_util.py
+++ b/cinder/volume/drivers/vmware/read_write_util.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/vim.py b/cinder/volume/drivers/vmware/vim.py
index d334d32be8f8ebab51121689f4133fe96d74066f..0d02543e0eac4e0fb9927ec8ad7f16d2be3ea4d2 100644 (file)
--- a/cinder/volume/drivers/vmware/vim.py
+++ b/cinder/volume/drivers/vmware/vim.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/vim_util.py b/cinder/volume/drivers/vmware/vim_util.py
index 01d96ea87891f4892fe7dd33ca63846d4f72e103..06e3100585bc6deafa4c7859ba9e4acea1640fb3 100644 (file)
--- a/cinder/volume/drivers/vmware/vim_util.py
+++ b/cinder/volume/drivers/vmware/vim_util.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index 2d446c1f2fdfc116f5d95eaa314ecf190f0663f3..d1d9999ca50d801eae5ebf00acc38e17d39aca0d 100644 (file)
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/vmware_images.py b/cinder/volume/drivers/vmware/vmware_images.py
index e4f4ddc4e17aa546e850cf57bc15b9aa1d7942aa..c56f158fb5e87ea615c79f2e52e4914c209bcf95 100644 (file)
--- a/cinder/volume/drivers/vmware/vmware_images.py
+++ b/cinder/volume/drivers/vmware/vmware_images.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/vmware/volumeops.py b/cinder/volume/drivers/vmware/volumeops.py
index 8160ed2043b8d1f436abaf8dc4dfbebfdec671d0..849f8649d5b4b9063c6ec804711a29a3118437e6 100644 (file)
--- a/cinder/volume/drivers/vmware/volumeops.py
+++ b/cinder/volume/drivers/vmware/volumeops.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 VMware, Inc.
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/windows/windows.py b/cinder/volume/drivers/windows/windows.py
index 0361fcbb2a6f10dca0e8e72ae9351fd998297962..68beda628bd22b65efd27891a9a6f49fa1ee322c 100644 (file)
--- a/cinder/volume/drivers/windows/windows.py
+++ b/cinder/volume/drivers/windows/windows.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Pedro Navarro Perez
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/windows/windows_utils.py b/cinder/volume/drivers/windows/windows_utils.py
index 6dd78cb25db4cf94259db1a05df8d29fc9cf1cfd..6e18fe76c6f4cde562442ff5ca904ca687220a1a 100644 (file)
--- a/cinder/volume/drivers/windows/windows_utils.py
+++ b/cinder/volume/drivers/windows/windows_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Pedro Navarro Perez
 # All Rights Reserved.
 #

diff --git a/cinder/volume/drivers/xenapi/lib.py b/cinder/volume/drivers/xenapi/lib.py
index a7969281edb98b303de5436659f0945e00bbb718..f271fee1d395873e5dd53daa604f1b92b8e4d500 100644 (file)
--- a/cinder/volume/drivers/xenapi/lib.py
+++ b/cinder/volume/drivers/xenapi/lib.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/xenapi/sm.py b/cinder/volume/drivers/xenapi/sm.py
index 11d167435831bb44473c8bd2ddc2a64b247d4b35..f96bc287fd339a1b49082656206bc705b5f57375 100644 (file)
--- a/cinder/volume/drivers/xenapi/sm.py
+++ b/cinder/volume/drivers/xenapi/sm.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/xiv_ds8k.py b/cinder/volume/drivers/xiv_ds8k.py
index 68c463f73c244b013c561af7af73c37ca7d6c45e..af50e22aca49466bf4612d5e1fcd1bfbe606a983 100644 (file)
--- a/cinder/volume/drivers/xiv_ds8k.py
+++ b/cinder/volume/drivers/xiv_ds8k.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # Copyright (c) 2013 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py
index 5d30339c8d733944ef43879a7be0d602dddc3c64..c65d366a294b0c979bcacefdc8a256888234442b 100644 (file)
--- a/cinder/volume/drivers/zadara.py
+++ b/cinder/volume/drivers/zadara.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 Zadara Storage, Inc.
 # Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.

diff --git a/cinder/volume/flows/base.py b/cinder/volume/flows/base.py
index 26c4805c26662244e0614b08d9253fea4081a0e6..fa6aa80b97c15ed227c9100153ac67487e168bf4 100644 (file)
--- a/cinder/volume/flows/base.py
+++ b/cinder/volume/flows/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (C) 2013 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/volume/flows/create_volume/__init__.py b/cinder/volume/flows/create_volume/__init__.py
index f8c511e77b450b8f1f0dd30e716cc5e2f0560cf0..bb38577630b8866a63a3c2d6409d16b1aa51f6e9 100644 (file)
--- a/cinder/volume/flows/create_volume/__init__.py
+++ b/cinder/volume/flows/create_volume/__init__.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright (C) 2013 Yahoo! Inc. All Rights Reserved.
 #    Copyright (c) 2013 OpenStack Foundation
 #    Copyright 2010 United States Government as represented by the

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 4ee29e4985550d662d56d57a3411606e3aa8f9e6..41518edbc6ca1bb6fcc5beaedc44e8c88943d65f 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/cinder/volume/qos_specs.py b/cinder/volume/qos_specs.py
index 79f7d521fcaabf609db84b5ab8d4cf74419a2dad..f905f748b8b7ca4a0d90df6746c61b765a17c775 100644 (file)
--- a/cinder/volume/qos_specs.py
+++ b/cinder/volume/qos_specs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 eBay Inc.
 # Copyright (c) 2013 OpenStack Foundation
 #

diff --git a/cinder/volume/rpcapi.py b/cinder/volume/rpcapi.py
index c74005921cb06ca78b81735d33001800ca7874ad..245e9dcd0e5697a2c843ff2d05db46f42f71ef8d 100644 (file)
--- a/cinder/volume/rpcapi.py
+++ b/cinder/volume/rpcapi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012, Intel, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index 4fcbaca48fa81e9d4961d8cf82ce8518cac162f5..4a5c0ea13c704ef287455f602122357aa97236e3 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/cinder/volume/volume_types.py b/cinder/volume/volume_types.py
index c969a1172551346f71ba3996af0ded5f00f45632..40ac862b02f8f42577d814ed840dc73a7d86bc7f 100644 (file)
--- a/cinder/volume/volume_types.py
+++ b/cinder/volume/volume_types.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 Zadara Storage Inc.
 # Copyright (c) 2011 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the

diff --git a/cinder/wsgi.py b/cinder/wsgi.py
index 20143783af26d6aaa87bb7bd0cbaaa5ee6cd50f1..0f64bbb2c4d71aa84455a453ccddc7eb617b87a6 100644 (file)
--- a/cinder/wsgi.py
+++ b/cinder/wsgi.py
@@ -1,5 +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.
 # Copyright 2010 OpenStack Foundation

diff --git a/tools/colorizer.py b/tools/colorizer.py
index b965d99b97f692d0444e671faa874682bbf3ef35..423e89817e79a8370211952e72d1f7e95c747fd3 100755 (executable)
--- a/tools/colorizer.py
+++ b/tools/colorizer.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013, Nebula, Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.

diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py
index 141cc75d24b21805771048e770d195e536c4e367..5ff57762935022397b69f314eb17a5ad94bcfe51 100644 (file)
--- a/tools/conf/extract_opts.py
+++ b/tools/conf/extract_opts.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 SINA Corporation
 # All Rights Reserved.
 # Author: Zhongyue Luo <lzyeval@gmail.com>

diff --git a/tools/install_venv.py b/tools/install_venv.py
index 9d76055cbc574dd91712f477a8fb09fa9ce0390d..d13393bf31302a5f184fdda6b335cee5c1dae20d 100644 (file)
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -1,5 +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.
 # All Rights Reserved.

diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index b5ec5092f09f6541ea3f4e944698328239dbf669..3e8c1e4a81fba70836291784aea1378426969ad3 100644 (file)
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 IBM Corp.
 #

diff --git a/tools/lintstack.py b/tools/lintstack.py
index 367078b4cee65767b4bf3c90e2a16e489ebe6b6f..afd22558b93afd842ca13f3e68e80443a9cf408a 100755 (executable)
--- a/tools/lintstack.py
+++ b/tools/lintstack.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013, AT&T Labs, Yun Mao <yunmao@gmail.com>
 # All Rights Reserved.
 #