scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40992 from k82cn/rm_empty_line

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41236, 40992)

Removed unnecessarly empty line.
This commit is contained in:
Kubernetes Submit Queue
2017-02-10 05:38:42 -08:00
committed by GitHub
parent 30f367e15b cc26fe6ee9
commit e9de1b0221
3 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet.go
View File

@@ -1789,7 +1789,6 @@ func (kl *Kubelet) syncLoopIteration(configCh <-chan kubetypes.PodUpdate, handle
// takes place only after kubelet calls the update handler to process // takes place only after kubelet calls the update handler to process
// the update to ensure the internal pod cache is up-to-date. // the update to ensure the internal pod cache is up-to-date.
kl.sourcesReady.AddSource(u.Source) kl.sourcesReady.AddSource(u.Source)
case e := <-plegCh: case e := <-plegCh:
if isSyncPodWorthy(e) { if isSyncPodWorthy(e) {
// PLEG event for a pod; sync it. // PLEG event for a pod; sync it.

1
pkg/kubelet/kubelet_node_status.go
View File

@@ -565,7 +565,6 @@ func (kl *Kubelet) setNodeStatusVersionInfo(node *v1.Node) {
// TODO: kube-proxy might be different version from kubelet in the future // TODO: kube-proxy might be different version from kubelet in the future
node.Status.NodeInfo.KubeProxyVersion = version.Get().String() node.Status.NodeInfo.KubeProxyVersion = version.Get().String()
} }
} }
// Set daemonEndpoints for the node. // Set daemonEndpoints for the node.

1
staging/src/k8s.io/client-go/util/workqueue/delaying_queue_test.go
View File

@@ -174,7 +174,6 @@ func TestAddTwoFireEarly(t *testing.T) {
if !reflect.DeepEqual(item, third) { if !reflect.DeepEqual(item, third) {
t.Errorf("expected %v, got %v", third, item) t.Errorf("expected %v, got %v", third, item)
} }
} }
func TestCopyShifting(t *testing.T) { func TestCopyShifting(t *testing.T) {