diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 10:12:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 10:12:55 -0400 |
| commit | 288ebec6e737c105fa0ef43412de4e0a8997feb9 (patch) | |
| tree | 57eb1b59866fd63b7618b885fcbfb1e614709cf4 /libpod/oci_conmon_linux.go | |
| parent | 6ed9868a34a875359852a910c23248946de59d20 (diff) | |
| parent | a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a (diff) | |
| download | podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.tar.gz podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.tar.bz2 podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.zip | |
Merge pull request #6909 from rhatdan/podman
Switch all references to github.com/containers/libpod -> podman
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 bd6af5281..e677ece31 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/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" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/lookup" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v2/utils" pmount "github.com/containers/storage/pkg/mount" "github.com/coreos/go-systemd/v22/activation" "github.com/coreos/go-systemd/v22/daemon" |