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 a4785950e..f33c25bf4 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 fe8611154..5d4ea2615 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 f2e9f33eb..4a59b8b3d 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 1a206ba13..dc29a2859 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 456044824..f48d3f775 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 e8dbf0eff..07db167b0 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 752b0cfef..e8ee1175b 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 53f31edcf..c461c1ef7 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 40e31f1c5..6d3aac431 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 d765b088e..2b43c2faf 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 8bd465ba4..a3a0371eb 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 889a249a5..d6fe9efbc 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 7fb1e7869..48804e81e 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 e34b5d550..335883114 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 ef8fc987e..d73862d66 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 d9ae464d5..3dd9919b4 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 69658ded3..fca342220 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 102668dae..998208665 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 de719f991..fd128561b 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 9a3efee58..b6fcf1022 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 63e9af4c4..a36ceb944 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 af309f114..532d40b7f 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 f45262fb4..b3e46cd09 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 e6d28f07a..85f10a1e3 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 1e98b6dc5..b20323d89 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 8672d0408..b1b4c999f 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 0a500094c..020b76906 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 5a3954965..4c3717b2b 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 5f88a74a7..8c97a1db1 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 13c95208b..e3a9ee5fb 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 37595725c..12259ec00 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 363828441..b2df8b68f 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 99eb33d6e..aa1256b33 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 141bbba73..1b916d567 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 94649bbc1..44821c465 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 363828441..b2df8b68f 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 9a64c523b..99d5ffd50 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 f90439581..c1b45acc6 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 cf8ef548b..d2bc37d85 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 00044df34..9981ee970 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 c17baeda0..528ca417d 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 1552d72a6..d542c9f9a 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 f7881a8a6..afa03afe4 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 728d4761d..cf96968d6 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 62a8ccb96..42941ff05 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 0e9ed4b43..3d6e014dc 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 f7a44c09c..de689521c 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 743d1aff9..996318383 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 dc9154e2a..5de57ccda 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 360178967..2b6099c82 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 70bd4d190..83e41d99d 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 d942e9886..fbdc0639a 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 8772d1c1c..ddb46c8f1 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 4ac0a3d4a..8239d9e72 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 4583acf41..d3ce0cb35 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 430761f88..dca0bd5aa 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 92a6743fb..149f403f7 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 2e077d79f..c97fdea8e 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 f4eb417ec..e59bc4f3f 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 e4164253d..81f2856c3 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 0aa6f9d18..21a862f56 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 053c74a9e..041aeb7eb 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 626051894..e433dca6b 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 ed526c6d0..a714db624 --- 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 785b18523..da71b1f87 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 8dcb026f1..4124675e8 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 bfe3e8eba..1974c8cbf 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 202079b0b..3cd0afb9c 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 d20cda953..352d640a9 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 ddd86d322..9c6aced6b 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 90cd67cd3..007a15db0 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 f23f4e07e..a786c6148 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 5b4a9f5e8..4c7f453e1 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 db7fe0e32..dddd9cc4c 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 c4a5095b9..112764e58 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 821f969e6..58b03bcfc 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 c027992fa..afc3b5b35 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 e3567473e..4bf8bffff 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 75627b371..63848efaa 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 2dabaa51a..6dfb68ea2 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 1b9368cc9..4558667ff 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 c95d25e37..6957f5da0 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 a226b55df..f66f09dde 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 a4b7df5f1..cc0288ee2 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 ebbb34580..ebfdff8cb 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 b21613f94..5a29e6852 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 f8f23ee54..0fe486992 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 641c33793..dc38e29a4 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 540a7bdf3..e73e08e4b 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 f87e9f5b5..84daca4e5 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 ee4fbc3f3..9915bfe57 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 a5debac32..54080ab64 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 b47c79e90..4fb4f07bc 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 52d6b384f..60f647029 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 d7cf41e2b..0ef53c019 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 0d766e20b..9e3999efa 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 b055705e7..a38ff7cac 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 0483b0a6e..a81012199 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 922a7ba5d..128716466 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 4a074f00e..0dcd355f6 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 515ef8c13..709300174 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 60fe5a67a..0ed7b2929 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 9cf978568..37484fe72 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 cb7dc4391..c37698235 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 9d5803244..02674f5cf 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 b572b369f..fb8ee2b96 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 cb73bd3a3..302a1a2db 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 c22b04bf3..a2c6e2e27 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 5a0a72c08..c0ef61081 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 c22b04bf3..a2c6e2e27 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 12af06c9e..7f8c542b5 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 312682d43..2b44ebe1f 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 662f6b15e..80cb26dde 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 c48d98dee..5f8728ba9 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 7c947e3aa..1cdc3ab3e 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 1a70daffd..c459fe1bc 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 8a2ed0616..5d321435b 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 e850536a5..1ff0aeee4 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 f702aa423..7520c7464 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 c63df146b..5323b741c 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 cb4cb0937..e2d2a1d93 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 53ae39e88..fcc9635d3 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 08f494de6..db10d43a6 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 790c8f6f8..882ed6895 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 c22b04bf3..a2c6e2e27 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 259911e57..4f8c9144f 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 214a50a6a..12acc9b6b 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 1cbdfd81b..64acba42b 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 9dbe8b16a..fc52fb9a5 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 856a325fa..4c111e78f 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 76db862db..8f6883061 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 65c4e0d69..427d694eb 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 c6a6c1c6f..56d90b303 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 18c2fb4f3..a940db19f 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 bcbbaa49b..8fc1b1f8f 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 1ef807ba2..51c1dad38 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 a7b9b9c37..cd51588d3 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 69f929c4f..8e93ef71a 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 5fa80dff0..47b73dcfb 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 6a6f3acb4..bbc0d3f95 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 7f2e95416..322e97aeb 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 841ec3791..7c73e6212 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 2d43aac42..fdf33be94 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 afd78854b..90b90324c 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 b9dc1ab2e..a19744033 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 3bf94ae21..b5b85ea68 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 af586b882..d7df676cf 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 ef9fa05a7..eac840c7e 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 076afeffc..9a1bbdd27 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 f154defa4..9713c65ad 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 d0318f336..18cea571f 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 8a1ff9309..3be3568ab 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 7c17b5ad7..1870fd0a8 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 5798ab3d1..6168280c2 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 ac53006c8..c06827cc1 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 b2dc5e739..ef9bb1b58 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 039ecbe13..de4cdcb30 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 9c1515de8..ef4e19333 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 92c02196b..9bdc872db 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 2017a89e3..68c89dbc2 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 84693413f..c169e0a4e 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 beeb376c2..2b49c8b46 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 eb846aafa..d4ba38c47 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 135516492..d37688ef2 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 7179d4089..0c37ecd60 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 0cfdc0519..d73b8ba2a 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 6d60d90c0..184939647 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 4903cdb10..d367a4849 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 ae852a406..3fdb4dcc0 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 8a171834b..2515fd2be 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 7a9cfb6aa..db1a6c5b7 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 c22b04bf3..a2c6e2e27 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 838546482..49d13bfcb 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 0b3ade1fb..4a8df9afd 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 4397b5b4e..ad6e051c0 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 bacef2a8d..c4f0ef9a2 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 672559413..81afed73f 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 0c9bd96e4..52e2564a9 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 d3161f567..d7bd28017 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 2a22a7a83..f4c5f4800 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 565d3363d..23874a9b4 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 97c9b3dd9..f9ecc3485 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 8034bca00..890b207cc 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 be24ba56a..1974ce000 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 31caa97e3..97d963eaa 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 f8aac33a3..03c4dcb40 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 6d42ac037..f07c8a4f6 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 e55eba95a..58e2355d4 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 686f2b614..548b9646e 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 6534325f0..bad9fc85f 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 7105a8fa9..e909b5d09 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 b7de142f9..99211269c 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 cfc014609..bc3da91e3 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 191aad59b..b37cb6932 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 3401dfbeb..e900f1306 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 c7c75e10d..b147e235d 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 8db16a5db..d6bdb3734 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 e27e686d3..50f8dc972 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 29ac18e22..60457217d 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 052b7fe95..3f8e93b76 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 48f8ef241..1a46bc5f5 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 be17f3916..b4c1af7ab 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 f6ca47c1f..6887913d7 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 fb0a52878..380c13522 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 188f2c176..49b864357 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 9cb552246..62a529dd3 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 d744c7718..63b33b33c 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 1ee09a81f..a3578730c 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 1a596bb83..f755dd83a 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 4fdb487bb..52e47d89c 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 b8aebd31a..45743990b 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 bec283069..bb8268ca1 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 ac3b4e52b..727647ff2 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 0329b9f7e..0aa8d80e9 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 8b7545c54..ce0ac9776 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 829d6d407..e9df123c2 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 68fbf40d8..f02509126 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 379342a70..2dd239302 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 b6fdf69f0..f293e04c0 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 45d5c07c2..8442c2c9b 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 794347662..23e92a336 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 c9ee4d427..bcda10469 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 09d1ee341..e3dbd70d7 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 40cb71bbb..e845ea618 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 90a41242f..d535c6ed3 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 ef1baba07..2599ee9ad 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 ae7f6977e..f33d012ea 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 b05dd8187..8bbf0c872 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 b1469c903..2a0de7528 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 7809843ba..550d64ed4 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 0cc82afe8..927969216 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 4b23d8450..e965b8df3 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 2d923ceba..a71bfbbd8 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 ab9d75319..3534ff084 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 0d70948dd..afaf2ca72 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 68551752d..523c16f6d 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 97c3aa82d..8366c14a4 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 ad2e8baa9..1bcbb40f3 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 b56e78a1a..5e44aefc9 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 48557c0e5..668726d21 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 368b7f821..640ec6555 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 956b8d7bf..969414b14 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 1ccdc30f8..50581cf89 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 f3c01d376..79bb1d992 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 0f922bd66..644dbb256 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 3f8c3eedd..76385dd9a 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 0f8d2e929..6bdd3d632 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 a0a559374..16f48bd87 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 3ca50948e..f80dda0c9 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 ed2d20a8d..58ee4af26 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 53b9832e5..d20cbf48f 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 8a04d4242..516349f4b 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 4fa9f22fb..375835c0d 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 4e0371b72..bcc8e1420 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 34282d106..3c19447c3 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 e404f998d..8029ec5f1 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 be4e0b148..26bbe92c8 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 ce3c1fdb4..45ef69f00 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 6fd28bb57..275a559a1 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 862c4e123..547f38ebd 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 7cd8ba8ec..0be99d953 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 61a47aa47..35be2fc4e 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 2428d533b..37263c0dd 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 d334d32be..0d02543e0 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 01d96ea87..06e310058 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 2d446c1f2..d1d9999ca 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 e4f4ddc4e..c56f158fb 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 8160ed204..849f8649d 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 0361fcbb2..68beda628 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 6dd78cb25..6e18fe76c 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 a7969281e..f271fee1d 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 11d167435..f96bc287f 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 68c463f73..af50e22ac 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 5d30339c8..c65d366a2 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 26c4805c2..fa6aa80b9 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 f8c511e77..bb3857763 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 4ee29e498..41518edbc 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 79f7d521f..f905f748b 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 c74005921..245e9dcd0 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 4fcbaca48..4a5c0ea13 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 c969a1172..40ac862b0 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 20143783a..0f64bbb2c 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 b965d99b9..423e89817 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 141cc75d2..5ff577629 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 9d76055cb..d13393bf3 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 b5ec5092f..3e8c1e4a8 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 367078b4c..afd22558b 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. # -- 2.45.2