summaryrefslogtreecommitdiff
path: root/cmd/podman/pods/ps.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-21 16:13:06 -0400
committerGitHub <noreply@github.com>2020-04-21 16:13:06 -0400
commitba1b5d4559d336b5d52d961eb273f6fe40c50d8f (patch)
tree765af64fae0f2c3156178e5c71d6d2cb19f1d111 /cmd/podman/pods/ps.go
parent02bd8cef7b7286f8955a68a00294c08d81803a4a (diff)
parentb21a5b7ff470612e2bde5f120aecfbc1a0881689 (diff)
downloadpodman-ba1b5d4559d336b5d52d961eb273f6fe40c50d8f.tar.gz
podman-ba1b5d4559d336b5d52d961eb273f6fe40c50d8f.tar.bz2
podman-ba1b5d4559d336b5d52d961eb273f6fe40c50d8f.zip
Merge pull request #5851 from jwhonce/wip/json
Provide a json variable pointing to a configured json API
Diffstat (limited to 'cmd/podman/pods/ps.go')
-rw-r--r--cmd/podman/pods/ps.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go
index 8cb7b6266..808980eff 100644
--- a/cmd/podman/pods/ps.go
+++ b/cmd/podman/pods/ps.go
@@ -2,7 +2,6 @@ package pods
import (
"context"
- "encoding/json"
"fmt"
"io"
"os"
@@ -11,10 +10,9 @@ import (
"text/template"
"time"
- "github.com/docker/go-units"
-
"github.com/containers/libpod/cmd/podman/registry"
"github.com/containers/libpod/pkg/domain/entities"
+ "github.com/docker/go-units"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)