Skip to content

Commit

Permalink
Merge pull request #23325 from MurgaNikolay/master
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
(cherry picked from commit 8f71655)
  • Loading branch information
k8s-merge-robot authored and eparis committed Mar 24, 2016
1 parent a056692 commit b2c129d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubelet/kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ func NewMainKubelet(
imageBackOff,
serializeImagePulls,
enableCustomMetrics,
hairpinMode == componentconfig.HairpinVeth,
klet.hairpinMode == componentconfig.HairpinVeth,
containerRuntimeOptions...,
)
case "rkt":
Expand Down

0 comments on commit b2c129d

Please sign in to comment.