Merge pull request #18878 from jsafrane/aws-idempotent-3.9

[release-3.9] UPSTREAM: 60490: Volume deletion should be idempotent
openshift · Mar 8, 2018 · 2d1461a · 2d1461a
2 parents 804ba0b + 39b54e1
commit 2d1461a
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/pv_util.go b/vendor/k8s.io/kubernetes/test/e2e/framework/pv_util.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/storage/volume_provisioning.go b/vendor/k8s.io/kubernetes/test/e2e/storage/volume_provisioning.go