Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes/cloud-provider-openstack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e55d1fb3497b62dc682d330b6b9e4fae38b649ed
Choose a base ref
..
head repository: kubernetes/cloud-provider-openstack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84436a2b3bc8d51ef3a55194498a902fca5ea06a
Choose a head ref
Showing with 0 additions and 4 deletions.
  1. +0 −4 pkg/util/blockdevice/blockdevice_linux.go
4 changes: 0 additions & 4 deletions pkg/util/blockdevice/blockdevice_linux.go
View file
Original file line number Diff line number Diff line change
@@ -134,11 +134,7 @@ func RescanDevice(devicePath string) error {
klog.V(3).Infof("Resolved block device path from %q to %q", devicePath, blockDeviceRescanPath)
err = triggerRescan(blockDeviceRescanPath)
if err != nil {
<<<<<<< HEAD
return fmt.Errorf("Error rescanning new block device geometry %s", devicePath)
=======
return fmt.Errorf("Error rescanning new block device geometry " + devicePath)
>>>>>>> bb2cb340 ([cinder-csi-plugin] retry mount operation with rescan (#2610))
}
return nil
}