From ff3f2e5735f0d486b72b6881b05ace94d6d34d03 Mon Sep 17 00:00:00 2001 From: DennyZhang <denny@unitedstack.com> Date: Tue, 24 Dec 2013 22:37:04 -0600 Subject: [PATCH] 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 --- bin/cinder-all | 2 -- bin/cinder-api | 2 -- bin/cinder-clear-rabbit-queues | 2 -- bin/cinder-manage | 2 -- bin/cinder-rootwrap | 2 -- bin/cinder-rpc-zmq-receiver | 2 -- bin/cinder-scheduler | 2 -- bin/cinder-volume | 2 -- bin/cinder-volume-usage-audit | 2 -- cinder/__init__.py | 2 -- cinder/api/__init__.py | 2 -- cinder/api/common.py | 2 -- cinder/api/contrib/__init__.py | 2 -- cinder/api/contrib/image_create.py | 2 -- cinder/api/contrib/qos_specs_manage.py | 2 -- cinder/api/contrib/quotas.py | 2 -- cinder/api/contrib/scheduler_hints.py | 2 -- cinder/api/contrib/services.py | 2 -- cinder/api/contrib/types_extra_specs.py | 2 -- cinder/api/contrib/types_manage.py | 2 -- cinder/api/contrib/used_limits.py | 2 -- cinder/api/contrib/volume_encryption_metadata.py | 2 -- cinder/api/contrib/volume_transfer.py | 2 -- cinder/api/contrib/volume_type_encryption.py | 2 -- cinder/api/extensions.py | 2 -- cinder/api/middleware/auth.py | 2 -- cinder/api/middleware/fault.py | 2 -- cinder/api/middleware/sizelimit.py | 2 -- cinder/api/openstack/wsgi.py | 2 -- cinder/api/urlmap.py | 2 -- cinder/api/v1/router.py | 2 -- cinder/api/v1/snapshot_metadata.py | 2 -- cinder/api/v1/types.py | 2 -- cinder/api/v1/volume_metadata.py | 2 -- cinder/api/v2/router.py | 2 -- cinder/api/v2/snapshot_metadata.py | 2 -- cinder/api/v2/types.py | 2 -- cinder/api/v2/views/volumes.py | 2 -- cinder/api/v2/volume_metadata.py | 2 -- cinder/api/versions.py | 2 -- cinder/api/views/limits.py | 2 -- cinder/api/views/types.py | 2 -- cinder/api/views/versions.py | 2 -- cinder/api/xmlutil.py | 2 -- cinder/backup/rpcapi.py | 2 -- cinder/brick/exception.py | 2 -- cinder/brick/executor.py | 2 -- cinder/brick/initiator/connector.py | 2 -- cinder/brick/initiator/host_driver.py | 2 -- cinder/brick/initiator/linuxfc.py | 2 -- cinder/brick/initiator/linuxscsi.py | 2 -- cinder/brick/iscsi/iscsi.py | 2 -- cinder/brick/local_dev/lvm.py | 2 -- cinder/brick/remotefs/remotefs.py | 2 -- cinder/common/config.py | 2 -- cinder/common/sqlalchemyutils.py | 2 -- cinder/compute/aggregate_states.py | 2 -- cinder/context.py | 2 -- cinder/db/__init__.py | 3 --- cinder/db/api.py | 2 -- cinder/db/base.py | 2 -- cinder/db/migration.py | 2 -- cinder/db/sqlalchemy/api.py | 2 -- cinder/db/sqlalchemy/migrate_repo/manage.py | 2 -- cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py | 2 -- cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 2 -- .../sqlalchemy/migrate_repo/versions/003_glance_metadata.py | 2 -- .../migrate_repo/versions/004_volume_type_to_uuid.py | 2 -- .../migrate_repo/versions/005_add_source_volume_column.py | 2 -- .../versions/006_snapshots_add_provider_location.py | 2 -- .../migrate_repo/versions/007_add_volume_snapshot_fk.py | 2 -- cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py | 2 -- .../migrate_repo/versions/009_add_snapshot_metadata_table.py | 2 -- .../migrate_repo/versions/010_add_transfers_table.py | 2 -- .../migrate_repo/versions/011_add_bootable_column.py | 2 -- .../migrate_repo/versions/012_add_attach_host_column.py | 2 -- .../migrate_repo/versions/013_add_provider_geometry_column.py | 2 -- cinder/db/sqlalchemy/migrate_repo/versions/014_add_name_id.py | 2 -- .../migrate_repo/versions/015_drop_migrations_table.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py | 2 -- .../migrate_repo/versions/017_add_encryption_information.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py | 2 -- .../versions/020_add_volume_admin_metadata_table.py | 2 -- .../migrate_repo/versions/022_add_reason_column_to_service.py | 2 -- cinder/db/sqlalchemy/migration.py | 2 -- cinder/db/sqlalchemy/models.py | 2 -- cinder/exception.py | 2 -- cinder/image/glance.py | 2 -- cinder/image/image_utils.py | 2 -- cinder/keymgr/__init__.py | 1 - cinder/keymgr/conf_key_mgr.py | 1 - cinder/keymgr/key.py | 2 -- cinder/keymgr/key_mgr.py | 1 - cinder/keymgr/not_implemented_key_mgr.py | 1 - cinder/manager.py | 2 -- cinder/policy.py | 2 -- cinder/quota.py | 2 -- cinder/scheduler/__init__.py | 2 -- cinder/scheduler/chance.py | 2 -- cinder/scheduler/driver.py | 2 -- cinder/scheduler/manager.py | 2 -- cinder/scheduler/rpcapi.py | 2 -- cinder/scheduler/scheduler_options.py | 2 -- cinder/scheduler/simple.py | 2 -- cinder/service.py | 2 -- cinder/test.py | 2 -- cinder/tests/__init__.py | 2 -- cinder/tests/api/__init__.py | 2 -- cinder/tests/api/common.py | 2 -- cinder/tests/api/contrib/__init__.py | 2 -- cinder/tests/api/contrib/test_hosts.py | 2 -- cinder/tests/api/contrib/test_quotas.py | 1 - cinder/tests/api/contrib/test_quotas_classes.py | 2 -- cinder/tests/api/contrib/test_scheduler_hints.py | 2 -- cinder/tests/api/contrib/test_types_extra_specs.py | 2 -- cinder/tests/api/contrib/test_volume_actions.py | 2 -- cinder/tests/api/contrib/test_volume_encryption_metadata.py | 4 ---- cinder/tests/api/contrib/test_volume_host_attribute.py | 2 -- cinder/tests/api/contrib/test_volume_image_metadata.py | 2 -- cinder/tests/api/contrib/test_volume_tenant_attribute.py | 2 -- cinder/tests/api/contrib/test_volume_type_encryption.py | 4 ---- cinder/tests/api/extensions/foxinsocks.py | 2 -- cinder/tests/api/fakes.py | 2 -- cinder/tests/api/middleware/test_faults.py | 2 -- cinder/tests/api/openstack/__init__.py | 2 -- cinder/tests/api/openstack/test_wsgi.py | 2 -- cinder/tests/api/test_common.py | 2 -- cinder/tests/api/test_extensions.py | 2 -- cinder/tests/api/test_wsgi.py | 2 -- cinder/tests/api/test_xmlutil.py | 2 -- cinder/tests/api/v1/stubs.py | 2 -- cinder/tests/api/v1/test_snapshot_metadata.py | 2 -- cinder/tests/api/v1/test_volume_metadata.py | 2 -- cinder/tests/api/v2/stubs.py | 2 -- cinder/tests/api/v2/test_snapshot_metadata.py | 2 -- cinder/tests/api/v2/test_volume_metadata.py | 2 -- cinder/tests/brick/test_brick_connector.py | 2 -- cinder/tests/brick/test_brick_linuxfc.py | 2 -- cinder/tests/brick/test_brick_linuxscsi.py | 2 -- cinder/tests/brick/test_brick_lvm.py | 2 -- cinder/tests/brick/test_brick_remotefs.py | 2 -- cinder/tests/conf_fixture.py | 2 -- cinder/tests/db/__init__.py | 2 -- cinder/tests/db/fakes.py | 2 -- cinder/tests/declare_conf.py | 2 -- cinder/tests/fake_flags.py | 2 -- cinder/tests/fake_utils.py | 2 -- cinder/tests/glance/__init__.py | 2 -- cinder/tests/glance/stubs.py | 2 -- cinder/tests/image/__init__.py | 2 -- cinder/tests/image/fake.py | 2 -- cinder/tests/image/test_glance.py | 2 -- cinder/tests/integrated/__init__.py | 2 -- cinder/tests/integrated/api/__init__.py | 2 -- cinder/tests/integrated/api/client.py | 2 -- cinder/tests/integrated/integrated_helpers.py | 2 -- cinder/tests/integrated/test_extensions.py | 2 -- cinder/tests/integrated/test_login.py | 2 -- cinder/tests/integrated/test_volumes.py | 2 -- cinder/tests/integrated/test_xml.py | 2 -- cinder/tests/keymgr/fake.py | 2 -- cinder/tests/keymgr/mock_key_mgr.py | 1 - cinder/tests/keymgr/test_conf_key_mgr.py | 1 - cinder/tests/keymgr/test_key.py | 2 -- cinder/tests/keymgr/test_key_mgr.py | 2 -- cinder/tests/keymgr/test_mock_key_mgr.py | 1 - cinder/tests/keymgr/test_not_implemented_key_mgr.py | 1 - cinder/tests/monkey_patch_example/__init__.py | 2 -- cinder/tests/monkey_patch_example/example_a.py | 2 -- cinder/tests/monkey_patch_example/example_b.py | 2 -- cinder/tests/runtime_conf.py | 2 -- cinder/tests/scheduler/__init__.py | 2 -- cinder/tests/scheduler/test_rpcapi.py | 1 - cinder/tests/scheduler/test_scheduler.py | 1 - cinder/tests/test_api.py | 1 - cinder/tests/test_conf.py | 1 - cinder/tests/test_context.py | 1 - cinder/tests/test_coraid.py | 1 - cinder/tests/test_emc.py | 1 - cinder/tests/test_exception.py | 1 - cinder/tests/test_glusterfs.py | 1 - cinder/tests/test_gpfs.py | 1 - cinder/tests/test_hp3par.py | 1 - cinder/tests/test_huawei_hvs.py | 1 - cinder/tests/test_huawei_t_dorado.py | 1 - cinder/tests/test_image_utils.py | 1 - cinder/tests/test_iscsi.py | 1 - cinder/tests/test_migrations.py | 1 - cinder/tests/test_misc.py | 1 - cinder/tests/test_netapp.py | 1 - cinder/tests/test_netapp_nfs.py | 1 - cinder/tests/test_netapp_ssc.py | 1 - cinder/tests/test_nexenta.py | 1 - cinder/tests/test_nfs.py | 1 - cinder/tests/test_policy.py | 1 - cinder/tests/test_qos_specs.py | 1 - cinder/tests/test_quota.py | 1 - cinder/tests/test_rbd.py | 1 - cinder/tests/test_service.py | 1 - cinder/tests/test_sheepdog.py | 1 - cinder/tests/test_solidfire.py | 1 - cinder/tests/test_test.py | 1 - cinder/tests/test_test_utils.py | 1 - cinder/tests/test_utils.py | 2 -- cinder/tests/test_vmware_vmdk.py | 2 -- cinder/tests/test_volume.py | 2 -- cinder/tests/test_volume_configuration.py | 2 -- cinder/tests/test_volume_glance_metadata.py | 2 -- cinder/tests/test_volume_rpcapi.py | 2 -- cinder/tests/test_volume_transfer.py | 2 -- cinder/tests/test_volume_types.py | 2 -- cinder/tests/test_volume_types_extra_specs.py | 2 -- cinder/tests/test_volume_utils.py | 2 -- cinder/tests/test_windows.py | 2 -- cinder/tests/test_wsgi.py | 2 -- cinder/tests/test_xenapi_sm.py | 2 -- cinder/tests/test_xiv_ds8k.py | 2 -- cinder/tests/test_zadara.py | 2 -- cinder/tests/utils.py | 2 -- cinder/tests/windows/db_fakes.py | 2 -- cinder/units.py | 2 -- cinder/utils.py | 2 -- cinder/version.py | 2 -- cinder/volume/__init__.py | 2 -- cinder/volume/api.py | 2 -- cinder/volume/configuration.py | 2 -- cinder/volume/driver.py | 2 -- cinder/volume/drivers/coraid.py | 2 -- cinder/volume/drivers/emc/emc_smis_common.py | 2 -- cinder/volume/drivers/emc/emc_smis_iscsi.py | 2 -- cinder/volume/drivers/glusterfs.py | 2 -- cinder/volume/drivers/gpfs.py | 2 -- cinder/volume/drivers/huawei/__init__.py | 2 -- cinder/volume/drivers/huawei/huawei_dorado.py | 2 -- cinder/volume/drivers/huawei/huawei_hvs.py | 2 -- cinder/volume/drivers/huawei/huawei_t.py | 2 -- cinder/volume/drivers/huawei/huawei_utils.py | 2 -- cinder/volume/drivers/huawei/rest_common.py | 2 -- cinder/volume/drivers/huawei/ssh_common.py | 2 -- cinder/volume/drivers/lvm.py | 2 -- cinder/volume/drivers/netapp/api.py | 2 -- cinder/volume/drivers/netapp/common.py | 2 -- cinder/volume/drivers/netapp/iscsi.py | 2 -- cinder/volume/drivers/netapp/nfs.py | 2 -- cinder/volume/drivers/netapp/options.py | 2 -- cinder/volume/drivers/netapp/ssc_utils.py | 2 -- cinder/volume/drivers/netapp/utils.py | 2 -- cinder/volume/drivers/nexenta/__init__.py | 2 -- cinder/volume/drivers/nexenta/iscsi.py | 2 -- cinder/volume/drivers/nexenta/jsonrpc.py | 2 -- cinder/volume/drivers/nexenta/nfs.py | 2 -- cinder/volume/drivers/nexenta/options.py | 2 -- cinder/volume/drivers/nexenta/utils.py | 2 -- cinder/volume/drivers/nfs.py | 2 -- cinder/volume/drivers/san/hp/hp_3par_common.py | 2 -- cinder/volume/drivers/san/hp/hp_3par_fc.py | 2 -- cinder/volume/drivers/san/hp/hp_3par_iscsi.py | 2 -- cinder/volume/drivers/san/san.py | 2 -- cinder/volume/drivers/solidfire.py | 2 -- cinder/volume/drivers/storwize_svc.py | 2 -- cinder/volume/drivers/vmware/error_util.py | 2 -- cinder/volume/drivers/vmware/io_util.py | 2 -- cinder/volume/drivers/vmware/read_write_util.py | 2 -- cinder/volume/drivers/vmware/vim.py | 2 -- cinder/volume/drivers/vmware/vim_util.py | 2 -- cinder/volume/drivers/vmware/vmdk.py | 2 -- cinder/volume/drivers/vmware/vmware_images.py | 2 -- cinder/volume/drivers/vmware/volumeops.py | 2 -- cinder/volume/drivers/windows/windows.py | 2 -- cinder/volume/drivers/windows/windows_utils.py | 2 -- cinder/volume/drivers/xenapi/lib.py | 2 -- cinder/volume/drivers/xenapi/sm.py | 2 -- cinder/volume/drivers/xiv_ds8k.py | 2 -- cinder/volume/drivers/zadara.py | 2 -- cinder/volume/flows/base.py | 2 -- cinder/volume/flows/create_volume/__init__.py | 2 -- cinder/volume/manager.py | 2 -- cinder/volume/qos_specs.py | 2 -- cinder/volume/rpcapi.py | 2 -- cinder/volume/utils.py | 2 -- cinder/volume/volume_types.py | 2 -- cinder/wsgi.py | 2 -- tools/colorizer.py | 2 -- tools/conf/extract_opts.py | 2 -- tools/install_venv.py | 2 -- tools/install_venv_common.py | 2 -- tools/lintstack.py | 2 -- 287 files changed, 539 deletions(-) mode change 100644 => 100755 cinder/db/sqlalchemy/migrate_repo/manage.py diff --git a/bin/cinder-all b/bin/cinder-all index a4785950e8c..f33c25bf4bc 100755 --- 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 fe861115485..5d4ea2615da 100755 --- 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 f2e9f33eb3f..4a59b8b3d5e 100755 --- 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 1a206ba137a..dc29a2859ac 100755 --- 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 456044824f4..f48d3f775e2 100755 --- 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 e8dbf0effe0..07db167b0bd 100755 --- 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 752b0cfefea..e8ee1175baf 100755 --- 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 53f31edcf66..c461c1ef7db 100755 --- 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 40e31f1c5dc..6d3aac43147 100755 --- 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 d765b088e93..2b43c2fafd2 100644 --- 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 8bd465ba430..a3a0371ebc9 100644 --- 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 889a249a51d..d6fe9efbcd5 100644 --- 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 7fb1e78690f..48804e81e68 100644 --- 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 e34b5d550a7..3358831143d 100644 --- 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 ef8fc987e70..d73862d666f 100644 --- 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 d9ae464d592..3dd9919b434 100644 --- 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 69658ded323..fca3422203c 100644 --- 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 102668dae19..998208665b5 100644 --- 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 de719f99188..fd128561bfa 100644 --- 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 9a3efee58e9..b6fcf1022fc 100644 --- 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 63e9af4c404..a36ceb9447b 100644 --- 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 af309f11415..532d40b7f03 100644 --- 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 f45262fb430..b3e46cd09a2 100644 --- 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 e6d28f07a25..85f10a1e3d1 100644 --- 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 1e98b6dc5fd..b20323d89de 100644 --- 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 8672d040849..b1b4c999fff 100644 --- 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 0a500094c2f..020b7690644 100644 --- 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 5a39549654f..4c3717b2b84 100644 --- 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 5f88a74a7bb..8c97a1db1f8 100644 --- 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 13c95208b73..e3a9ee5fb3b 100644 --- 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 37595725c2a..12259ec0051 100644 --- 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 3638284411d..b2df8b68f30 100644 --- 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 99eb33d6e75..aa1256b33ea 100644 --- 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 141bbba731f..1b916d5675f 100644 --- 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 94649bbc1d7..44821c46599 100644 --- 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 3638284411d..b2df8b68f30 100644 --- 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 9a64c523b12..99d5ffd50d5 100644 --- 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 f904395814e..c1b45acc655 100644 --- 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 cf8ef548b7f..d2bc37d8537 100644 --- 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 00044df3486..9981ee9705a 100644 --- 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 c17baeda05a..528ca417dd7 100644 --- 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 1552d72a63f..d542c9f9ab6 100644 --- 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 f7881a8a642..afa03afe455 100644 --- 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 728d4761d48..cf96968d6f0 100644 --- 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 62a8ccb965b..42941ff05c9 100644 --- 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 0e9ed4b4366..3d6e014dcdd 100644 --- 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 f7a44c09c90..de689521cce 100644 --- 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 743d1aff91d..996318383d9 100644 --- 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 dc9154e2ae7..5de57ccdac0 100644 --- 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 36017896703..2b6099c8254 100644 --- 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 70bd4d19034..83e41d99db9 100644 --- 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 d942e988606..fbdc0639a12 100644 --- 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 8772d1c1c66..ddb46c8f18d 100644 --- 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 4ac0a3d4a5c..8239d9e724d 100644 --- 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 4583acf41ff..d3ce0cb35f8 100644 --- 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 430761f8887..dca0bd5aa36 100644 --- 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 92a6743fb08..149f403f751 100644 --- 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 2e077d79fdb..c97fdea8e5e 100644 --- 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 f4eb417ec9f..e59bc4f3fc4 100644 --- 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 e4164253df7..81f2856c334 100644 --- 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 0aa6f9d18bb..21a862f564a 100644 --- 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 053c74a9e90..041aeb7eb97 100644 --- 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 6260518948b..e433dca6bd5 100644 --- 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 new mode 100755 index ed526c6d066..a714db62404 --- 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 785b1852338..da71b1f8719 100644 --- 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 8dcb026f109..4124675e8ac 100644 --- 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 bfe3e8ebaf1..1974c8cbf18 100644 --- 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 202079b0be8..3cd0afb9cae 100644 --- 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 d20cda953c4..352d640a92c 100644 --- 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 ddd86d32282..9c6aced6b11 100644 --- 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 90cd67cd3bc..007a15db05b 100644 --- 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 f23f4e07e2a..a786c61485f 100644 --- 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 5b4a9f5e83c..4c7f453e159 100644 --- 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 db7fe0e32a2..dddd9cc4c3a 100644 --- 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 c4a5095b998..112764e5812 100644 --- 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 821f969e662..58b03bcfc20 100644 --- 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 c027992fa1a..afc3b5b35c6 100644 --- 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 e3567473e17..4bf8bffff24 100644 --- 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 75627b371be..63848efaa2d 100644 --- 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 2dabaa51ad2..6dfb68ea21f 100644 --- 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 1b9368cc9f7..4558667ff28 100644 --- 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 c95d25e3795..6957f5da072 100644 --- 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 a226b55df25..f66f09ddee7 100644 --- 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 a4b7df5f1ee..cc0288ee278 100644 --- 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 ebbb345804d..ebfdff8cb11 100644 --- 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 b21613f9489..5a29e6852db 100644 --- 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 f8f23ee54cb..0fe486992e9 100644 --- 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 641c337935b..dc38e29a4e3 100644 --- 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 540a7bdf30c..e73e08e4bde 100644 --- 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 f87e9f5b535..84daca4e53c 100644 --- 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 ee4fbc3f32c..9915bfe576c 100644 --- 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 a5debac3249..54080ab64c4 100644 --- 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 b47c79e9055..4fb4f07bc05 100644 --- 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 52d6b384f6c..60f6470296c 100644 --- 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 d7cf41e2bc0..0ef53c01945 100644 --- 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 0d766e20bce..9e3999efaf7 100644 --- 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 b055705e7bf..a38ff7cacdb 100644 --- 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 0483b0a6e91..a8101219914 100644 --- 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 922a7ba5d6f..12871646643 100644 --- 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 4a074f00ef2..0dcd355f680 100644 --- 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 515ef8c1357..7093001742e 100644 --- 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 60fe5a67a9c..0ed7b2929f0 100644 --- 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 9cf9785686f..37484fe722b 100644 --- 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 cb7dc439189..c376982359a 100644 --- 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 9d580324403..02674f5cfee 100644 --- 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 b572b369f08..fb8ee2b964b 100644 --- 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 cb73bd3a3cf..302a1a2dbab 100644 --- 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 c22b04bf348..a2c6e2e27d1 100644 --- 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 5a0a72c0859..c0ef6108158 100644 --- 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 c22b04bf348..a2c6e2e27d1 100644 --- 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 12af06c9e14..7f8c542b593 100644 --- 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 312682d4340..2b44ebe1f44 100644 --- 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 662f6b15ef7..80cb26dde15 100644 --- 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 c48d98dee72..5f8728ba9fe 100644 --- 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 7c947e3aac0..1cdc3ab3ece 100644 --- 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 1a70daffd2a..c459fe1bcc1 100644 --- 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 8a2ed0616fd..5d321435b06 100644 --- 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 e850536a54a..1ff0aeee4e0 100644 --- 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 f702aa423d4..7520c7464f0 100644 --- 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 c63df146b76..5323b741cc0 100644 --- 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 cb4cb0937b8..e2d2a1d9357 100644 --- 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 53ae39e88fa..fcc9635d33e 100644 --- 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 08f494de6a1..db10d43a611 100644 --- 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 790c8f6f8ce..882ed689512 100644 --- 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 c22b04bf348..a2c6e2e27d1 100644 --- 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 259911e57e3..4f8c9144f28 100644 --- 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 214a50a6afb..12acc9b6bbf 100644 --- 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 1cbdfd81baf..64acba42b14 100644 --- 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 9dbe8b16a82..fc52fb9a51b 100644 --- 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 856a325fac6..4c111e78fdb 100644 --- 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 76db862db8d..8f6883061c3 100644 --- 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 65c4e0d69fc..427d694eba0 100644 --- 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 c6a6c1c6f2e..56d90b30367 100644 --- 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 18c2fb4f354..a940db19f2e 100644 --- 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 bcbbaa49b1a..8fc1b1f8fb0 100644 --- 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 1ef807ba2be..51c1dad38a1 100644 --- 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 a7b9b9c37a8..cd51588d3e3 100644 --- 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 69f929c4f53..8e93ef71a27 100644 --- 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 5fa80dff00b..47b73dcfb1c 100644 --- 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 6a6f3acb489..bbc0d3f95bc 100644 --- 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 7f2e954168e..322e97aeb36 100644 --- 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 841ec379124..7c73e621270 100644 --- 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 2d43aac42ff..fdf33be9412 100644 --- 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 afd78854b85..90b90324cc9 100644 --- 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 b9dc1ab2e73..a1974403316 100644 --- 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 3bf94ae21d2..b5b85ea687f 100644 --- 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 af586b882da..d7df676cf03 100644 --- 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 ef9fa05a7ce..eac840c7edb 100644 --- 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 076afeffc9f..9a1bbdd27d9 100644 --- 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 f154defa40f..9713c65adde 100644 --- 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 d0318f336ae..18cea571f74 100644 --- 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 8a1ff9309e4..3be3568ab44 100644 --- 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 7c17b5ad74a..1870fd0a8fb 100644 --- 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 5798ab3d1e6..6168280c249 100644 --- 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 ac53006c8f7..c06827cc1f9 100644 --- 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 b2dc5e73980..ef9bb1b58ae 100644 --- 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 039ecbe13e5..de4cdcb3013 100644 --- 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 9c1515de828..ef4e1933372 100644 --- 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 92c02196bf1..9bdc872dbf9 100644 --- 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 2017a89e3f0..68c89dbc26c 100644 --- 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 84693413fcc..c169e0a4e07 100644 --- 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 beeb376c267..2b49c8b4655 100644 --- 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 eb846aafa7e..d4ba38c47e7 100644 --- 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 1355164929a..d37688ef29b 100644 --- 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 7179d408917..0c37ecd60d9 100644 --- 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 0cfdc0519c8..d73b8ba2a37 100644 --- 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 6d60d90c091..18493964700 100644 --- 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 4903cdb100b..d367a484945 100644 --- 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 ae852a4068d..3fdb4dcc056 100644 --- 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 8a171834b01..2515fd2be4b 100644 --- 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 7a9cfb6aaa0..db1a6c5b713 100644 --- 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 c22b04bf348..a2c6e2e27d1 100644 --- 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 838546482c9..49d13bfcbfd 100644 --- 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 0b3ade1fb53..4a8df9afd8d 100644 --- 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 4397b5b4e51..ad6e051c0c4 100644 --- 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 bacef2a8d1b..c4f0ef9a2fa 100644 --- 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 6725594133c..81afed73fe0 100644 --- 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 0c9bd96e462..52e2564a927 100644 --- 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 d3161f567f5..d7bd2801794 100644 --- 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 2a22a7a834a..f4c5f480028 100644 --- 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 565d3363d00..23874a9b4cd 100644 --- 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 97c9b3dd9e6..f9ecc348591 100644 --- 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 8034bca00d5..890b207cc4e 100644 --- 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 be24ba56a11..1974ce00028 100644 --- 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 31caa97e315..97d963eaa4e 100644 --- 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 f8aac33a38a..03c4dcb400a 100644 --- 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 6d42ac037c8..f07c8a4f6b8 100644 --- 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 e55eba95ae5..58e2355d41c 100644 --- 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 686f2b61413..548b9646e55 100644 --- 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 6534325f022..bad9fc85f7a 100644 --- 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 7105a8fa955..e909b5d0959 100644 --- 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 b7de142f90c..99211269ccf 100644 --- 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 cfc01460918..bc3da91e3ad 100644 --- 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 191aad59ba8..b37cb6932a4 100644 --- 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 3401dfbebae..e900f1306a7 100644 --- 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 c7c75e10db2..b147e235d3b 100644 --- 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 8db16a5dbea..d6bdb3734d6 100644 --- 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 e27e686d3c8..50f8dc972e3 100644 --- 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 29ac18e22c9..60457217d47 100644 --- 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 052b7fe95ad..3f8e93b7623 100644 --- 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 48f8ef24117..1a46bc5f58b 100644 --- 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 be17f391679..b4c1af7abba 100644 --- 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 f6ca47c1f3b..6887913d775 100644 --- 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 fb0a5287863..380c1352226 100644 --- 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 188f2c1764a..49b8643571e 100644 --- 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 9cb55224610..62a529dd344 100644 --- 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 d744c7718b4..63b33b33c94 100644 --- 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 1ee09a81f4e..a3578730c22 100644 --- 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 1a596bb83a4..f755dd83a89 100644 --- 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 4fdb487bb60..52e47d89c45 100644 --- 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 b8aebd31a1e..45743990b1f 100644 --- 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 bec28306994..bb8268ca1c5 100644 --- 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 ac3b4e52bd6..727647ff217 100644 --- 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 0329b9f7ed4..0aa8d80e9e1 100644 --- 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 8b7545c5432..ce0ac9776ec 100644 --- 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 829d6d407b4..e9df123c242 100644 --- 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 68fbf40d833..f02509126be 100644 --- 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 379342a70e5..2dd23930275 100644 --- 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 b6fdf69f084..f293e04c0d8 100644 --- 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 45d5c07c272..8442c2c9b44 100644 --- 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 7943476628f..23e92a336ea 100644 --- 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 c9ee4d427af..bcda10469ec 100644 --- 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 09d1ee341a6..e3dbd70d7fc 100644 --- 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 40cb71bbbd8..e845ea618e9 100644 --- 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 90a41242f09..d535c6ed3e7 100644 --- 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 ef1baba077e..2599ee9ad9f 100644 --- 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 ae7f6977eec..f33d012ead6 100644 --- 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 b05dd8187a2..8bbf0c872ed 100644 --- 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 b1469c90396..2a0de752884 100644 --- 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 7809843ba30..550d64ed4c8 100644 --- 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 0cc82afe8f3..9279692169c 100644 --- 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 4b23d8450f9..e965b8df322 100644 --- 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 2d923ceba5f..a71bfbbd801 100644 --- 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 ab9d75319a4..3534ff084a4 100644 --- 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 0d70948ddea..afaf2ca728f 100644 --- 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 68551752dd4..523c16f6dde 100644 --- 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 97c3aa82d58..8366c14a44d 100644 --- 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 ad2e8baa93b..1bcbb40f362 100644 --- 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 b56e78a1a3e..5e44aefc96c 100644 --- 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 48557c0e518..668726d216d 100644 --- 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 368b7f82195..640ec65556f 100644 --- 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 956b8d7bf07..969414b14ee 100644 --- 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 1ccdc30f8fd..50581cf898a 100644 --- 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 f3c01d376db..79bb1d99251 100644 --- 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 0f922bd6698..644dbb2569f 100644 --- 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 3f8c3eeddf7..76385dd9acd 100644 --- 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 0f8d2e9294e..6bdd3d63244 100644 --- 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 a0a559374c6..16f48bd877e 100644 --- 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 3ca50948e3f..f80dda0c90a 100644 --- 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 ed2d20a8d95..58ee4af26a4 100644 --- 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 53b9832e56f..d20cbf48f25 100644 --- 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 8a04d4242da..516349f4b71 100644 --- 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 4fa9f22fb48..375835c0d61 100644 --- 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 4e0371b72a6..bcc8e1420ab 100644 --- 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 34282d1069c..3c19447c3c9 100644 --- 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 e404f998dc3..8029ec5f167 100644 --- 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 be4e0b1483e..26bbe92c8c3 100644 --- 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 ce3c1fdb4a3..45ef69f00dd 100644 --- 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 6fd28bb5700..275a559a1e5 100644 --- 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 862c4e12328..547f38ebde5 100644 --- 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 7cd8ba8ec57..0be99d95391 100644 --- 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 61a47aa4721..35be2fc4e48 100644 --- 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 2428d533b7c..37263c0ddd0 100644 --- 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 d334d32be8f..0d02543e0ea 100644 --- 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 01d96ea8789..06e3100585b 100644 --- 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 2d446c1f2fd..d1d9999ca50 100644 --- 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 e4f4ddc4e17..c56f158fb5e 100644 --- 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 8160ed2043b..849f8649d5b 100644 --- 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 0361fcbb2a6..68beda628bd 100644 --- 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 6dd78cb25db..6e18fe76c6f 100644 --- 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 a7969281edb..f271fee1d39 100644 --- 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 11d16743583..f96bc287fd3 100644 --- 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 68c463f73c2..af50e22aca4 100644 --- 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 5d30339c8d7..c65d366a294 100644 --- 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 26c4805c266..fa6aa80b97c 100644 --- 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 f8c511e77b4..bb38577630b 100644 --- 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 4ee29e49855..41518edbc6c 100644 --- 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 79f7d521fca..f905f748b8b 100644 --- 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 c74005921cb..245e9dcd0e5 100644 --- 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 4fcbaca48fa..4a5c0ea13c7 100644 --- 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 c969a117255..40ac862b02f 100644 --- 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 20143783af2..0f64bbb2c4d 100644 --- 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 b965d99b97f..423e89817e7 100755 --- 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 141cc75d24b..5ff57762935 100644 --- 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 9d76055cbc5..d13393bf313 100644 --- 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 b5ec5092f09..3e8c1e4a81f 100644 --- 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 367078b4cee..afd22558b93 100755 --- 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. #