diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-18 22:01:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 22:01:14 +0100 |
| commit | c9b13133cdd9f59a000d40fce357c33919ef7032 (patch) | |
| tree | bfa2e524b71757a514a02ef68661b46dca9a3dfe /cmd/podman/common.go | |
| parent | e738ef16225395f5f5e4b93ba1a43ae9449ae11b (diff) | |
| parent | 7141f972700ed454438d8539dd0bec79c0b61cf4 (diff) | |
| download | podman-c9b13133cdd9f59a000d40fce357c33919ef7032.tar.gz podman-c9b13133cdd9f59a000d40fce357c33919ef7032.tar.bz2 podman-c9b13133cdd9f59a000d40fce357c33919ef7032.zip | |
Merge pull request #1692 from sjug/opentracing_clean
OpenTracing First Impl
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index ec755c4a8..fed07de7c 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -104,6 +104,9 @@ func getAllOrLatestContainers(c *cliconfig.PodmanCommand, runtime *libpod.Runtim // getContext returns a non-nil, empty context func getContext() context.Context { + if Ctx != nil { + return Ctx + } return context.TODO() } |