Merge pull request #20529 from DirectXMan12/bug/oc-adm-top-streams

UPSTREAM: 66931: Use the passed-in streams in kubectl top
openshift · Aug 3, 2018 · fb87b21 · fb87b21
2 parents 675772c + 283e8ad
commit fb87b21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go