Merge pull request #17052 from rootfs/azure-fixes-37

Automatic merge from submit-queue. upstream azure fixes fix https://bugzilla.redhat.com/show_bug.cgi?id=1506708 and https://bugzilla.redhat.com/show_bug.cgi?id=1513859
openshift · Dec 5, 2017 · 5a8373a · 5a8373a
2 parents b3931ae + 54542e0
commit 5a8373a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/azure/azure_blobDiskController.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/azure/azure_blobDiskController.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_common.go b/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_common.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_mounter.go b/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_mounter.go