k8s-merge-robot 698441cad3 Merge pull request #14655 from aveshagarwal/master-proxy-issue ...

Auto commit by PR queue bot

2015-09-30 22:51:20 -07:00

..

server_test.go

Change kube-proxy flag: annotation for proxy-mode

2015-09-21 18:06:24 -07:00

server.go

Merge pull request #14655 from aveshagarwal/master-proxy-issue

2015-09-30 22:51:20 -07:00