Merge pull request #5585 from ncdc/cherry-pick-16590

Merged by openshift-bot
openshift · Nov 3, 2015 · 192bef7 · 192bef7
2 parents 668d8e4 + 10a9b21
commit 192bef7
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 42 deletions.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/remotecommand/v1.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/remotecommand/v1.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/remotecommand/v2.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/remotecommand/v2.go