summaryrefslogtreecommitdiff
path: root/vendor/modules.txt
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-27 16:01:45 +0200
committerGitHub <noreply@github.com>2019-06-27 16:01:45 +0200
commit0906b32087c3d7db6844873a7d46241430a1b065 (patch)
tree3c68a0c2d6e2e5742b4cc314136ddb8e9877ec75 /vendor/modules.txt
parent5e3d63a53c0762c99c5eb7863ef7fc8d0b2e8eec (diff)
parent8561b996447793999a6465f9b9e3f0f7bbea2c6a (diff)
downloadpodman-0906b32087c3d7db6844873a7d46241430a1b065.tar.gz
podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.bz2
podman-0906b32087c3d7db6844873a7d46241430a1b065.zip
Merge pull request #3442 from baude/removelibpodfrommainphase2
libpod removal from main (phase 2)
Diffstat (limited to 'vendor/modules.txt')
-rw-r--r--vendor/modules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 52780f69a..914472508 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -542,11 +542,11 @@ k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1
k8s.io/apimachinery/pkg/util/wait
k8s.io/apimachinery/pkg/util/runtime
+k8s.io/apimachinery/pkg/selection
k8s.io/apimachinery/pkg/runtime
k8s.io/apimachinery/pkg/runtime/schema
k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/util/intstr
-k8s.io/apimachinery/pkg/selection
k8s.io/apimachinery/pkg/conversion
k8s.io/apimachinery/pkg/labels
k8s.io/apimachinery/pkg/watch