Skip to content

Commit 82ed019

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #15437 from rootfs/fc-fencing-master
Automatic merge from submit-queue UPSTREAM: 48940: support fc volume attach and detach fix https://bugzilla.redhat.com/show_bug.cgi?id=1450224 @childsb @eparis
2 parents d8a2507 + 70111fa commit 82ed019

File tree

7 files changed

+185
-22
lines changed

7 files changed

+185
-22
lines changed

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/BUILD

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/fc/BUILD

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/fc/attacher.go

Lines changed: 170 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/fc/disk_manager.go

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/fc/fc_test.go

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/fc/fc_util.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)