Skip to content

Commit e4f2115

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18636 from sjenning/picks-volume-manager
Automatic merge from submit-queue. Picks for volume manager Thanks to @jsafrane for these fixes kubernetes/kubernetes#59873 kubernetes/kubernetes#59923 59923 modified from upstream because some logging levels where already higher in 1.9 xref https://bugzilla.redhat.com/show_bug.cgi?id=1538216 Fixes #17605 Fixes #17556 @derekwaynecarr
2 parents ddb6d36 + a2ec6c9 commit e4f2115

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go

+12-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/volume_manager.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)