Merge "trivial: Remove trailing spaces, mixed tabs/spaces"

api-ref/source/v2/qos-specs-v2-qos-specs.inc

@@ -69,8 +69,7 @@ Request Example
 Response Example
 ----------------
 
-.. literalinclude:: ./samples/qos-unset-response.json
+There is no body content for the response of a successful PUT operation.
-   :language: javascript
 
 
 Get all associations for QoS specification

api-ref/source/v2/quota-sets.inc

@@ -146,8 +146,7 @@ Request
 Response Example
 ----------------
 
-.. literalinclude:: ./samples/quotas-delete-response.json
+There is no body content for the response of a successful DELETE operation.
-   :language: javascript
 
 Get default quotas
 ~~~~~~~~~~~~~~~~~~

api-ref/source/v2/samples/volume-os-migrate_volume_completion-request.json

@@ -1,6 +1,6 @@
 {
     "os-migrate_volume_completion": {
         "new_volume": "2b955850-f177-45f7-9f49-ecb2c256d161",
-        "error": false,
+        "error": false
     }
 }

api-ref/source/v3/samples/volume-detach-request.json

@@ -1,6 +1,6 @@
-{
+{
-    "os-detach": {
+    "os-detach": {
-        "attachment_id": "d8777f54-84cf-4809-a679-468ffed56cf1"
+        "attachment_id": "d8777f54-84cf-4809-a679-468ffed56cf1"
-    }
+    }
-}
+}
-
+

api-ref/source/v3/samples/volume-os-migrate_volume_completion-request.json

@@ -1,6 +1,6 @@
 {
     "os-migrate_volume_completion": {
         "new_volume": "2b955850-f177-45f7-9f49-ecb2c256d161",
-        "error": false,
+        "error": false
     }
 }

api-ref/source/v3/samples/volume_transfers/v3.55/volume-transfers-create-request.json

@@ -1,6 +1,6 @@
 {
-	"transfer": {
+    "transfer": {
-            "volume_id": "1bb4acc9-9fa4-4b4d-8992-3259b69c8372",
+        "volume_id": "1bb4acc9-9fa4-4b4d-8992-3259b69c8372",
-            "name": "first volume"
+        "name": "first volume"
     }
-}
+}

api-ref/source/v3/samples/volume_transfers/v3.57/volume-transfers-create-request.json

@@ -1,7 +1,7 @@
 {
-	"transfer": {
+    "transfer": {
-            "volume_id": "80d68197-b67e-4c8e-bbb9-030b2581f921",
+        "volume_id": "80d68197-b67e-4c8e-bbb9-030b2581f921",
-            "name": "first volume",
+        "name": "first volume",
-	    "no_snapshots": false
+        "no_snapshots": false
     }
-}
+}

api-ref/source/v3/volumes-v3-volumes.inc

@@ -518,7 +518,7 @@ Preconditions
   belong to a group, have snapshots or be disassociated from
   snapshots after volume transfer.
 
-- The ``cascade`` option can be passed in the request if you want 
+- The ``cascade`` option can be passed in the request if you want
   all snapshots of this volume to be deleted automatically,
   which should allow the volume deletion to succeed.
 

cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-request.json.tpl

@@ -1,5 +1,5 @@
 {
-	"transfer": {
+    "transfer": {
             "volume_id": "%(volume_id)s",
             "name": "first volume"
     }

cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-response.json.tpl

@@ -15,6 +15,6 @@
         ],
         "name": "first volume",
         "volume_id": "%(uuid)s",
-	"no_snapshots": false
+        "no_snapshots": false
     }
 }

cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-show-response.json.tpl

@@ -14,6 +14,6 @@
         ],
         "name": "first volume",
         "volume_id": "%(uuid)s",
-	"no_snapshots": false
+        "no_snapshots": false
     }
 }

cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-request.json.tpl

@@ -1,7 +1,7 @@
 {
-	"transfer": {
+    "transfer": {
-            "volume_id": "%(volume_id)s",
+        "volume_id": "%(volume_id)s",
-            "name": "first volume",
+        "name": "first volume",
-	    "no_snapshots": false
+        "no_snapshots": false
     }
 }

cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-response.json.tpl

@@ -15,9 +15,9 @@
         ],
         "name": "first volume",
         "volume_id": "%(uuid)s",
-	"no_snapshots": false,
+        "no_snapshots": false,
-	"destination_project_id": null,
+        "destination_project_id": null,
-	"source_project_id": "%(uuid)s",
+        "source_project_id": "%(uuid)s",
-	"accepted": false
+        "accepted": false
     }
 }

cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-show-response.json.tpl

@@ -14,9 +14,9 @@
         ],
         "name": "first volume",
         "volume_id": "%(uuid)s",
-	"destination_project_id": null,
+        "destination_project_id": null,
-	"source_project_id": "%(uuid)s",
+        "source_project_id": "%(uuid)s",
-	"accepted": false,
+        "accepted": false,
-	"no_snapshots": false
+        "no_snapshots": false
     }
 }

cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_cinder.yaml

@@ -504,8 +504,6 @@ test_update_migrated_volume_smp:
 
 test_create_group_snap:
 
-test_create_cgsnapshot:
-
 test_create_cloned_cg:
 
 test_create_cloned_group:

cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml

@@ -1648,8 +1648,6 @@ test_delete_snapshot_adapter: *test_delete_snapshot
 
 test_restore_snapshot_adapter: *test_restore_snapshot
 
-test_create_cgsnapshot: *test_create_cg_snapshot
-
 test_do_create_cgsnap: *test_create_cg_snapshot
 
 test_do_delete_cgsnap:
@@ -1901,16 +1899,12 @@ test_terminate_connection:
       get_sg: *sg_terminate_connection
 
 test_terminate_connection_force_detach:
-  sg: &sg_terminate_connection_force_detach_1
+  sg: &sg_terminate_connection_force_detach
-    _properties:
-      existed: True
-  sg: &sg_terminate_connection_force_detach_2
     _properties:
       existed: True
   sgs: &sgs_terminate_connection_force_detach
     _methods:
-      shadow_copy: [*sg_terminate_connection_force_detach_1,
+      shadow_copy: [*sg_terminate_connection_force_detach]
-                    *sg_terminate_connection_force_detach_2]
   vnx:
     _methods:
       get_sg: *sgs_terminate_connection_force_detach
@@ -2141,8 +2135,6 @@ test_create_cg_from_cgsnapshot:
 
 test_create_group_from_group_snapshot:
 
-test_create_cgsnapshot:
-
 test_create_group_snapshot:
 
 test_delete_group_snapshot:

doc/source/configuration/block-storage/drivers/macrosan-storage-driver.rst

@@ -1,4 +1,4 @@
-==========================================
+==========================================
 MacroSAN Fibre Channel and iSCSI drivers
 ==========================================
 

releasenotes/notes/VMEM-6000-drivers-removed-9b6675ff7ae5f960.yaml

@@ -1,3 +1,3 @@
 ---
 upgrade:
-  - Violin Memory 6000 array series drivers are removed. 
+  - Violin Memory 6000 array series drivers are removed.

releasenotes/notes/bug-1518213-a5bf2ea0d008f329.yaml

@@ -1,3 +1,3 @@
 ---
 features:
-  - Added Keystone v3 support for Swift backup driver in single user mode. 
+  - Added Keystone v3 support for Swift backup driver in single user mode.

releasenotes/notes/bug-1837524-strowize-create_consistency_group_failures-bb2a976dfe9454a4.yaml

@@ -2,5 +2,5 @@
 fixes:
   - |
     `Bug #1837524 <https://bugs.launchpad.net/cinder/+bug/1837524>`_:
-    IBM Spectrum Virtualize Family: Fixed create_consistency_group if 
+    IBM Spectrum Virtualize Family: Fixed create_consistency_group if
     the volume has mirror copy and mdisk_grp_name=many.

releasenotes/notes/get-driver-opts-924f72346ca1e459.yaml

@@ -1,5 +1,5 @@
-features: 
+features:
   - |
-    Seagate driver: Added support for ``get_driver_options`` api call 
+    Seagate driver: Added support for ``get_driver_options`` api call
   - |
     Lenovo driver: Return additional configuration options from ``get_driver_options`` call

releasenotes/notes/hnas-deprecate-iscsi-driver-cd521b3a2ba948f3.yaml

@@ -1,7 +1,7 @@
 ---
 upgrade:
   - The Hitachi NAS iSCSI driver has been marked as unsupported and is
-    now deprecated. ``enable_unsupported_drivers`` will need to be set to 
+    now deprecated. ``enable_unsupported_drivers`` will need to be set to
     ``True`` in cinder.conf to continue to use it.
 deprecations:
   - The Hitachi NAS iSCSI driver has been marked as unsupported and is now

releasenotes/notes/huawei-backend-capabilities-report-optimization-d1c18d9f62ef71aa.yaml

@@ -1,3 +1,3 @@
 ---
 features:
-  - Optimize backend reporting capabilities for Huawei drivers.  
+  - Optimize backend reporting capabilities for Huawei drivers.

releasenotes/source/ocata.rst

@@ -686,7 +686,7 @@ Upgrade Notes
 
 .. releasenotes/notes/remove-eqlx-deprecated-options-89ba02c41d4da62a.yaml @ b'c5630ce51dd7b3902bbf204707a3ae6674884109'
 
-- 
+-
   Removing the Dell EqualLogic driver's deprecated configuration options.
   Please replace old options in your cinder.conf with the new one.
 

tools/fast8.sh

@@ -15,7 +15,7 @@ CHANGED=""
 CHANGED+="$(git diff --name-only HEAD~${NUM_COMMITS} \*.py | tr '\n' ' ')"
 
 while [[ -z $CHANGED ]]; do
-	# Search back until we find a commit containing python files
+    # Search back until we find a commit containing python files
     NUM_COMMITS=$((NUM_COMMITS + 1))
     CHANGED+="$(git diff --name-only HEAD~${NUM_COMMITS} \*.py | tr '\n' ' ')" ;
 done