Merge pull request #17173 from ironcladlou/pick-kube-54921

Automatic merge from submit-queue. UPSTREAM: 54921: rename metric reflector_xx_last_resource_version Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509341 xref kubernetes/kubernetes#54921
openshift · Nov 3, 2017 · 5843c72 · 5843c72
2 parents ba7839e + 282c341
commit 5843c72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/util/reflector/prometheus/prometheus.go b/vendor/k8s.io/kubernetes/pkg/util/reflector/prometheus/prometheus.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/tools/cache/reflector.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/tools/cache/reflector.go