Merge pull request #18167 from joelsmith/release-3.7

Automatic merge from submit-queue. [3.7] UPSTREAM: 57422: Rework method of updating atomic-updated data volumes See #18165 for background info.
openshift · Jan 21, 2018 · 4bb2151 · 4bb2151
2 parents f972e1b + 601bc1a
commit 4bb2151
Show file tree

Hide file tree

Showing 5 changed files with 178 additions and 94 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/configmap/configmap_test.go b/vendor/k8s.io/kubernetes/pkg/volume/configmap/configmap_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/projected/projected_test.go b/vendor/k8s.io/kubernetes/pkg/volume/projected/projected_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/secret/secret_test.go b/vendor/k8s.io/kubernetes/pkg/volume/secret/secret_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/atomic_writer.go b/vendor/k8s.io/kubernetes/pkg/volume/util/atomic_writer.go