summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-21 05:54:57 -0400
committerGitHub <noreply@github.com>2020-07-21 05:54:57 -0400
commitdf6920aa79073b2767d24c6524367384b6284b31 (patch)
treeb56fdbd8b13f4edf3c3e0638b0f970533157d50b /pkg
parent1682e60dac14d9f32ae02c5f3286b3309cd9b128 (diff)
parent841eac0af651d7afa4749a65f4e773815b5c715c (diff)
downloadpodman-df6920aa79073b2767d24c6524367384b6284b31.tar.gz
podman-df6920aa79073b2767d24c6524367384b6284b31.tar.bz2
podman-df6920aa79073b2767d24c6524367384b6284b31.zip
Merge pull request #7009 from rhatdan/containers.conf
Switch references from libpod.conf to containers.conf
Diffstat (limited to 'pkg')
-rw-r--r--pkg/network/config.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/network/config.go b/pkg/network/config.go
index e5c981419..a504e0ad0 100644
--- a/pkg/network/config.go
+++ b/pkg/network/config.go
@@ -6,8 +6,8 @@ import (
"net"
)
-// TODO once the libpod.conf file stuff is worked out, this should be modified
-// to honor defines in the libpod.conf as well as overrides?
+// TODO once the containers.conf file stuff is worked out, this should be modified
+// to honor defines in the containers.conf as well as overrides?
const (
// CNIConfigDir is the path where CNI config files exist