scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39627 from alejandroEsc/ae/kubelet/log

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39695, 37054, 39627, 39546, 39615)

fixed error log that would cause two log lines to run into each other…

**What this PR does / why we need it**:
Fixed error log that would cause two log lines to run into each other. Logs running into each other can be reproduced by running local-up-cluster.sh on osx.


**Release note**:
```NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-01-10 18:57:24 -08:00
committed by GitHub
parent 5aa177a81f 6a4f8b54f7
commit 87b9f6fa24
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/hyperkube/hyperkube.go
View File

@@ -188,7 +188,7 @@ func (hk *HyperKube) Run(args []string) error {
func (hk *HyperKube) RunToExit(args []string) { func (hk *HyperKube) RunToExit(args []string) {
err := hk.Run(args) err := hk.Run(args)
if err != nil { if err != nil {
fmt.Fprint(os.Stderr, err.Error()) fmt.Fprintf(os.Stderr, "Error: %v\n", err.Error())
os.Exit(1) os.Exit(1)
} }
os.Exit(0) os.Exit(0)