diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 17:57:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 17:57:10 +0200 |
| commit | 13db0f2b61b17e6f959fff832b40270352cd54da (patch) | |
| tree | ab1c4ca5ea7926e0731136bb4e358c6d3407f8da /cmd/podman | |
| parent | 2547fe53127057ce8f3ba065b4263fea32be7f0d (diff) | |
| parent | 20407a2f1fadb1488caac1560dfdd56facff4153 (diff) | |
| download | podman-13db0f2b61b17e6f959fff832b40270352cd54da.tar.gz podman-13db0f2b61b17e6f959fff832b40270352cd54da.tar.bz2 podman-13db0f2b61b17e6f959fff832b40270352cd54da.zip | |
Merge pull request #6118 from baude/v2bindingsenforce
set binding tests to required
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/stats.go | 1 | ||||
| -rw-r--r-- | cmd/podman/manifest/annotate.go | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 3f9db671f..5b7f52cc7 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -234,7 +234,6 @@ func outputJSON(stats []*containerStats) error { Pids: j.PIDS(), }) } - b, err := json.MarshalIndent(jstats, "", " ") if err != nil { return err diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index 21d4fb747..82ee1ffda 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -24,7 +24,7 @@ var ( func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, + Mode: []entities.EngineMode{entities.ABIMode}, Command: annotateCmd, Parent: manifestCmd, }) |