k8s-merge-robot 6dc3dcf36a Merge pull request #15414 from thockin/exp-beta-annotations ...

Auto commit by PR queue bot

2015-10-20 17:45:32 -07:00

..

server_test.go

Add beta annotation for kube-proxy

2015-10-14 15:31:37 -07:00

server.go

Merge pull request #15414 from thockin/exp-beta-annotations

2015-10-20 17:45:32 -07:00