Merge pull request #16544 from smarterclayton/enable_log_with_tail

Auto commit by PR queue bot

Merge pull request #16544 from smarterclayton/enable_log_with_tail
8a6020ef · k8s-merge-robot · 55246db6 · 2335bfa3 · 8a6020ef
Commit 8a6020ef authored Oct 30, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

manager.go pkg/kubelet/dockertools/manager.go +1 -1

No files found.
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -290,7 +290,7 @@ func (dm *DockerManager) GetContainerLogs(pod *api.Pod, containerID kubecontaine
 		RawTerminal:  false,
 	}

-	if !logOptions.Follow && logOptions.TailLines != nil {
+	if logOptions.TailLines != nil {
 		opts.Tail = strconv.FormatInt(*logOptions.TailLines, 10)
 	}