diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 13:43:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:43:54 -0400 |
| commit | 0291928abb27aceda429088eede903604a1e9bbd (patch) | |
| tree | 4f6efed902d338c8b8eb7fdb79247b29e2551e9a /pkg | |
| parent | 1b8d0e454353224a571bcec7d37240140ec7917f (diff) | |
| parent | 330e9144bd49a090484ade39339b3c3453253105 (diff) | |
| download | podman-0291928abb27aceda429088eede903604a1e9bbd.tar.gz podman-0291928abb27aceda429088eede903604a1e9bbd.tar.bz2 podman-0291928abb27aceda429088eede903604a1e9bbd.zip | |
Merge pull request #7033 from rhatdan/v2.0
[2.0] Switch references from libpod.conf to containers.conf
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/network/config.go | 4 |
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 |