diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 11:20:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 11:20:41 -0400 |
| commit | 1a60550bef976a57777c75e055ad35ff8cf87f23 (patch) | |
| tree | 0ddfcf25f83af0edd54ae3677634c2b14617f4c8 /libpod/oci_conmon_linux.go | |
| parent | aa4ec20c0f0d495acf753a4040db48df8c918dc5 (diff) | |
| parent | 2d74811520db30cba7246dd1122d484b0c02e5d7 (diff) | |
| download | podman-1a60550bef976a57777c75e055ad35ff8cf87f23.tar.gz podman-1a60550bef976a57777c75e055ad35ff8cf87f23.tar.bz2 podman-1a60550bef976a57777c75e055ad35ff8cf87f23.zip | |
Merge pull request #6865 from vrothberg/2.0-v2-module
[2.0] move go module to v2
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 625a5bf70..e9d5cbaa3 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -21,13 +21,13 @@ import ( "github.com/containers/common/pkg/config" conmonConfig "github.com/containers/conmon/runner/config" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/cgroups" - "github.com/containers/libpod/pkg/errorhandling" - "github.com/containers/libpod/pkg/lookup" - "github.com/containers/libpod/pkg/rootless" - "github.com/containers/libpod/pkg/util" - "github.com/containers/libpod/utils" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/cgroups" + "github.com/containers/libpod/v2/pkg/errorhandling" + "github.com/containers/libpod/v2/pkg/lookup" + "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/libpod/v2/utils" pmount "github.com/containers/storage/pkg/mount" "github.com/coreos/go-systemd/v22/activation" spec "github.com/opencontainers/runtime-spec/specs-go" |