diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-14 21:33:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-14 21:33:40 +0200 |
| commit | 9b6cb7e80f98df9725686d849ae9a5ca69858f4d (patch) | |
| tree | 42ae57763f8f73f3a31cc64506ae3175d2c4b7da /pkg/domain | |
| parent | 5d1144062a534b9ec504ee2866cc90ecea16358d (diff) | |
| parent | d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0 (diff) | |
| download | podman-9b6cb7e80f98df9725686d849ae9a5ca69858f4d.tar.gz podman-9b6cb7e80f98df9725686d849ae9a5ca69858f4d.tar.bz2 podman-9b6cb7e80f98df9725686d849ae9a5ca69858f4d.zip | |
Merge pull request #15794 from edsantiago/bats_races
System tests: fix three races
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 324802a1f..572807ad6 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -517,7 +517,7 @@ func (ic *ContainerEngine) ContainerLogs(_ context.Context, nameOrIDs []string, stdout := opts.StdoutWriter != nil stderr := opts.StderrWriter != nil options := new(containers.LogOptions).WithFollow(opts.Follow).WithSince(since).WithUntil(until).WithStderr(stderr) - options.WithStdout(stdout).WithTail(tail) + options.WithStdout(stdout).WithTail(tail).WithTimestamps(opts.Timestamps) var err error stdoutCh := make(chan string) |