Merge pull request #24756 from euank/rkt-fix-os-arg

Automatic merge from submit-queue rkt: Pass through os argument This was lost in a rebase in #24496 and, while not required to build, is required to function correctly under rkt (else panics!) cc @yifan-gu

Merge pull request #24756 from euank/rkt-fix-os-arg
44021747 · k8s-merge-robot · 577fa2e2 · 941caa13 · 44021747
Commit 44021747 authored Apr 25, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

rkt.go pkg/kubelet/rkt/rkt.go +1 -0

No files found.
--- a/pkg/kubelet/rkt/rkt.go
+++ b/pkg/kubelet/rkt/rkt.go
@@ -199,6 +199,7 @@ func New(
 		livenessManager:     livenessManager,
 		volumeGetter:        volumeGetter,
 		execer:              execer,
+		os:                  os,
 		touchPath:           touchPath,
 	}