diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-24 12:18:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 12:18:41 -0500 |
| commit | 2cb011ef2b17adbc7b1de1db4861f6e3eaa24025 (patch) | |
| tree | 4a11aaa48ea843ca56bc37cf1e9deca0fffc476e /vendor | |
| parent | 874bde20504830ac6c5169190cddcf5fe6a9caa9 (diff) | |
| parent | f3e883fb4c537e81bd498b2141662b071d7e53c7 (diff) | |
| download | podman-2cb011ef2b17adbc7b1de1db4861f6e3eaa24025.tar.gz podman-2cb011ef2b17adbc7b1de1db4861f6e3eaa24025.tar.bz2 podman-2cb011ef2b17adbc7b1de1db4861f6e3eaa24025.zip | |
Merge pull request #13336 from containers/dependabot/go_modules/github.com/containernetworking/plugins-1.1.0
Bump github.com/containernetworking/plugins from 1.0.1 to 1.1.0
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containernetworking/plugins/pkg/ns/ns_linux.go | 4 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/containernetworking/plugins/pkg/ns/ns_linux.go b/vendor/github.com/containernetworking/plugins/pkg/ns/ns_linux.go index 3b745d491..f260f2813 100644 --- a/vendor/github.com/containernetworking/plugins/pkg/ns/ns_linux.go +++ b/vendor/github.com/containernetworking/plugins/pkg/ns/ns_linux.go @@ -106,8 +106,8 @@ var _ NetNS = &netNS{} const ( // https://github.com/torvalds/linux/blob/master/include/uapi/linux/magic.h - NSFS_MAGIC = 0x6e736673 - PROCFS_MAGIC = 0x9fa0 + NSFS_MAGIC = unix.NSFS_MAGIC + PROCFS_MAGIC = unix.PROC_SUPER_MAGIC ) type NSPathNotExistErr struct{ msg string } diff --git a/vendor/modules.txt b/vendor/modules.txt index 32d0152e0..d82524493 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -84,7 +84,7 @@ github.com/containernetworking/cni/pkg/types/create github.com/containernetworking/cni/pkg/types/internal github.com/containernetworking/cni/pkg/utils github.com/containernetworking/cni/pkg/version -# github.com/containernetworking/plugins v1.0.1 +# github.com/containernetworking/plugins v1.1.0 ## explicit github.com/containernetworking/plugins/pkg/ns # github.com/containers/buildah v1.24.2 |