github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a2da4f0cac
kubernetes/cmd
History
Kubernetes Submit Queue 87b9f6fa24 Merge pull request #39627 from alejandroEsc/ae/kubelet/log 
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
```
2017-01-10 18:57:24 -08:00
..
clicheck Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
cloud-controller-manager Merge pull request #39394 from wlan0/master 2017-01-09 12:05:17 -08:00
gendocs Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
genkubedocs Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
genman Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
genslateyaml Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
genswaggertypedocs Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
genutils Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
genyaml Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
hyperkube fixed error log that would cause two log lines to run into each other. This can be reproduced by running local-up-cluster.sh on osx. 2017-01-09 12:13:45 -08:00
kube-aggregator rename kubernetes-discovery to kube-aggregator 2017-01-10 12:27:42 -05:00
kube-apiserver Merge pull request #37784 from bruceauyeung/k8s-branch-fix-glog-message-typo 2017-01-06 17:43:32 -08:00
kube-controller-manager updates from review 2017-01-09 17:20:19 -07:00
kube-discovery Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
kube-proxy Merge pull request #37054 from tanshanshan/remove-repeat1 2017-01-10 18:57:22 -08:00
kubeadm kubeadm: add preflight check for bridge-nf 2017-01-09 09:56:02 -08:00
kubectl Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
kubelet Merge pull request #39591 from NickrenREN/kubelet-app-RunKubelet 2017-01-10 13:33:12 -08:00
kubemark Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
libs/go2idl refactor: Move versioned/watch to meta/v1 2017-01-06 23:45:03 -05:00
linkcheck Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
mungedocs Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
BUILD rename kubernetes-discovery to kube-aggregator 2017-01-10 12:27:42 -05:00
OWNERS Remove myself from a bunch of OWNERS files, as I am too overloaded 2016-05-11 13:34:51 -07:00