Merge pull request #17863 from deads2k/quota-02-watch

Automatic merge from submit-queue. UPSTREAM: 57349: add watch to requirements for quota-able resources Fixes part two of #17784 This avoids putting istags in the list at all /assign soltysh /assign derekwaynecarr
openshift · Dec 22, 2017 · c50bc3f · c50bc3f
2 parents 24d4f09 + 30a6ec3
commit c50bc3f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go