Merge pull request #17454 from fabianofranz/release-3.7

Automatic merge from submit-queue. [3.7] UPSTREAM: 49128: add svc and netpol to discovery Fixes #17411 and https://bugzilla.redhat.com/show_bug.cgi?id=1515878 Add svc and netpol to discovery, picking kubernetes/kubernetes@8232778 into the **enterprise-3.7** branch. PTAL @deads2k @smarterclayton
openshift · Nov 27, 2017 · 7ed6862 · 7ed6862
2 parents 06970e6 + cb413eb
commit 7ed6862
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/service/rest.go b/vendor/k8s.io/kubernetes/pkg/registry/core/service/rest.go
diff --git a/vendor/k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage/BUILD b/vendor/k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage/storage.go b/vendor/k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage/storage.go