github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38252 from linyouchong/linyouchong-20161207

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38252, 41122, 36101, 41017, 41264)

fix bug of runServer function in server.go

What this PR does / why we need it:
use parameter network instead of hardcode 'tcp' / the parameter network here is not equal to 'tcp'

**Special notes for your reviewer**:
NONE

**Release note**:
NONE
This commit is contained in:
Kubernetes Submit Queue 2017-02-10 15:59:37 -08:00 committed by GitHub
commit c3d6b1ca48
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/server/serve.go
View File

@ -149,7 +149,7 @@ func runServer(server *http.Server, network string, stopCh <-chan struct{}) (int
for { for {
time.Sleep(15 * time.Second) time.Sleep(15 * time.Second)
ln, err = net.Listen("tcp", server.Addr) ln, err = net.Listen(network, server.Addr)
if err == nil { if err == nil {
return return
} }