diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-02 19:35:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 19:35:33 -0400 |
| commit | 7bb1d240281e95aeb5eb5f761823e766d2804683 (patch) | |
| tree | c03a19ce82df57651218a0133d571c7887ce8b88 /libkpod/container_server.go | |
| parent | f0f5b51ff27d8eec790f2d5fc12c28c536149bb7 (diff) | |
| parent | 6e37df18ef4e2750e954bf64f7dc46d57dcade3a (diff) | |
| download | podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.gz podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.bz2 podman-7bb1d240281e95aeb5eb5f761823e766d2804683.zip | |
Merge pull request #6 from rhatdan/papr
Add Papr support
Diffstat (limited to 'libkpod/container_server.go')
| -rw-r--r-- | libkpod/container_server.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libkpod/container_server.go b/libkpod/container_server.go index 067b5a906..8e0e09978 100644 --- a/libkpod/container_server.go +++ b/libkpod/container_server.go @@ -12,16 +12,16 @@ import ( cstorage "github.com/containers/storage" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/truncindex" - "github.com/projectatomic/libpod/libkpod/sandbox" - "github.com/projectatomic/libpod/oci" - "github.com/projectatomic/libpod/pkg/annotations" - "github.com/projectatomic/libpod/pkg/registrar" - "github.com/projectatomic/libpod/pkg/storage" "github.com/opencontainers/runc/libcontainer" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod/sandbox" + "github.com/projectatomic/libpod/oci" + "github.com/projectatomic/libpod/pkg/annotations" + "github.com/projectatomic/libpod/pkg/registrar" + "github.com/projectatomic/libpod/pkg/storage" "github.com/sirupsen/logrus" pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) |