diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-13 10:14:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 10:14:09 -0700 |
| commit | 1fa664166571ab7dd3abe1b0d64ae9a81a8688ae (patch) | |
| tree | fc6b218409181bbe49c7c315bcba16ab160d49f4 /libpod/container_api.go | |
| parent | 8b3f759800ebd6e53e0a807728ede633aa9bdb36 (diff) | |
| parent | 8f418f1568b2735fdeea9a84afc354e1f8cbc94c (diff) | |
| download | podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.tar.gz podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.tar.bz2 podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.zip | |
Merge pull request #2628 from TomSweeneyRedHat/dev/tsweeney/bigvendorbuildah2
Vendor docker/docker, fsouza and more #2
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 3698a15ec..33ec938f7 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -14,7 +14,7 @@ import ( "github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/lookup" "github.com/containers/storage/pkg/stringid" - "github.com/docker/docker/daemon/caps" + "github.com/docker/docker/oci/caps" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" |