mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 18:53:35 +00:00
cleanup: move internal/rbd/errors.go to internal/rbd/errors pacakge
Signed-off-by: Praveen M <m.praveen@ibm.com>
(cherry picked from commit 5cbc14454a
)
# Conflicts:
# internal/csi-addons/rbd/encryptionkeyrotation.go
# internal/csi-addons/rbd/reclaimspace.go
# internal/csi-addons/rbd/replication.go
# internal/csi-addons/rbd/replication_test.go
# internal/rbd/clone.go
# internal/rbd/controllerserver.go
# internal/rbd/group/util.go
# internal/rbd/group/util_test.go
# internal/rbd/manager.go
# internal/rbd/rbd_journal.go
# internal/rbd/rbd_util.go
# internal/rbd/rbd_util_test.go
# internal/rbd/snapshot.go
# internal/util/errors.go
This commit is contained in:
@ -16,9 +16,13 @@ limitations under the License.
|
||||
|
||||
package util
|
||||
|
||||
<<<<<<< HEAD
|
||||
import (
|
||||
"errors"
|
||||
)
|
||||
=======
|
||||
import "errors"
|
||||
>>>>>>> 5cbc1445 (cleanup: move internal/rbd/errors.go to internal/rbd/errors pacakge)
|
||||
|
||||
var (
|
||||
// ErrKeyNotFound is returned when requested key in omap is not found.
|
||||
|
Reference in New Issue
Block a user