diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-16 06:41:15 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-16 17:12:36 +0000 |
| commit | d20f3a51463ce75d139dd830e19a173906b0b0cb (patch) | |
| tree | c4cb4fe0d68ac052149031c590823b033a92fa80 /cmd/podman/ps.go | |
| parent | c0abfaa7c38a8fc897a4c1f64392ace40a5a10c1 (diff) | |
| download | podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.gz podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.bz2 podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.zip | |
switch projectatomic to containers
Need to get some small changes into libpod to pull back into buildah
to complete buildah transition.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1270
Approved by: mheon
Diffstat (limited to 'cmd/podman/ps.go')
| -rw-r--r-- | cmd/podman/ps.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index a5f862f8f..94e8a4920 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -8,14 +8,14 @@ import ( "strings" "time" + "github.com/containers/libpod/cmd/podman/batchcontainer" + "github.com/containers/libpod/cmd/podman/formats" + "github.com/containers/libpod/cmd/podman/libpodruntime" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/util" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-units" "github.com/pkg/errors" - "github.com/projectatomic/libpod/cmd/podman/batchcontainer" - "github.com/projectatomic/libpod/cmd/podman/formats" - "github.com/projectatomic/libpod/cmd/podman/libpodruntime" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/pkg/util" "github.com/sirupsen/logrus" "github.com/urfave/cli" "k8s.io/apimachinery/pkg/fields" |