diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-28 07:19:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 07:19:34 -0700 |
| commit | ef1b58e6f28d21959196d29d5e9ab065d4e9a818 (patch) | |
| tree | 691ecc024dfedff5695e426a8f3a6c077cfc34b8 /cmd/podman | |
| parent | e7a2eecf5f3975edfb92cd2cacff0d34ef45f808 (diff) | |
| parent | a5443a532b0fc6bd787cbb472c0ad2f75447c9df (diff) | |
| download | podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.tar.gz podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.tar.bz2 podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.zip | |
Merge pull request #2789 from vrothberg/vendor
vendor buildah, image, storage, cni
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/cp.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go index 6223676ac..18fb2cb73 100644 --- a/cmd/podman/cp.go +++ b/cmd/podman/cp.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" + "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/util" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/chrootuser" "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" |