github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-24 09:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22939 from resouer/util-sub-dir

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-23 03:34:33 -07:00
parent 2777cd7e75 f19d59cf35
commit 76369c42be
20 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/integration/integration.go
View File

@@ -55,6 +55,7 @@ import (
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
utilnet "k8s.io/kubernetes/pkg/util/net"
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/sets"
@@ -972,7 +973,7 @@ func main() {
gruntime.GOMAXPROCS(gruntime.NumCPU())
addFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
utilruntime.ReallyCrash = true
util.InitLogs()
defer util.FlushLogs()