openshift · openshift-merge-robot · Dec 20, 2017 · Dec 14, 2017 · Dec 14, 2017 · Dec 14, 2017
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -67,14 +67,17 @@ import:
   version: release-3.9
 - package: github.com/openshift/client-go
   version: release-3.9
-# only used by pkg/build/builder
-- package: github.com/kubernetes-incubator/cri-o
-  version: a8ee86b1cce0c13bd541a99140682a92635ba9f7
 - package: github.com/containers/image
   repo:    [email protected]:openshift/containers-image
   version: openshift-3.8
+# yours: containers/image.  No idea why this isn't self-pinning.
+- package: github.com/containers/storage
+  version: 47536c89fcc545a87745e1a1573addc439409165
 - package: github.com/vjeantet/ldapserver
   version: v1.0
+# ours: containers/storage uses it, but oc/bootstrap does too.  pinning to last level
+- package: github.com/docker/engine-api
+  version: dea108d3aa0c67d7162a3fd8aa65f38a430019fd
 
 # ours because of genapidocs.  This is the current kube level
 - package: github.com/go-openapi/loads

diff --git a/pkg/build/builder/Godeps/Godeps.json b/pkg/build/builder/Godeps/Godeps.json
diff --git a/...com/kubernetes-incubator/cri-o/.gitignore → ...com/kubernetes-incubator/cri-o/.gitignore b/...com/kubernetes-incubator/cri-o/.gitignore → ...com/kubernetes-incubator/cri-o/.gitignore
diff --git a/...com/kubernetes-incubator/cri-o/.tool/lint → ...com/kubernetes-incubator/cri-o/.tool/lint b/...com/kubernetes-incubator/cri-o/.tool/lint → ...com/kubernetes-incubator/cri-o/.tool/lint
diff --git a/...om/kubernetes-incubator/cri-o/.travis.yml → ...om/kubernetes-incubator/cri-o/.travis.yml b/...om/kubernetes-incubator/cri-o/.travis.yml → ...om/kubernetes-incubator/cri-o/.travis.yml
diff --git a/...com/kubernetes-incubator/cri-o/Dockerfile → ...com/kubernetes-incubator/cri-o/Dockerfile b/...com/kubernetes-incubator/cri-o/Dockerfile → ...com/kubernetes-incubator/cri-o/Dockerfile
diff --git a/...m/kubernetes-incubator/cri-o/KPOD_VERSION → ...m/kubernetes-incubator/cri-o/KPOD_VERSION b/...m/kubernetes-incubator/cri-o/KPOD_VERSION → ...m/kubernetes-incubator/cri-o/KPOD_VERSION
diff --git a/...ub.com/kubernetes-incubator/cri-o/LICENSE → ...ub.com/kubernetes-incubator/cri-o/LICENSE b/...ub.com/kubernetes-incubator/cri-o/LICENSE → ...ub.com/kubernetes-incubator/cri-o/LICENSE
diff --git a/...b.com/kubernetes-incubator/cri-o/Makefile → ...b.com/kubernetes-incubator/cri-o/Makefile b/...b.com/kubernetes-incubator/cri-o/Makefile → ...b.com/kubernetes-incubator/cri-o/Makefile
diff --git a/...hub.com/kubernetes-incubator/cri-o/OWNERS → ...hub.com/kubernetes-incubator/cri-o/OWNERS b/...hub.com/kubernetes-incubator/cri-o/OWNERS → ...hub.com/kubernetes-incubator/cri-o/OWNERS
diff --git a/....com/kubernetes-incubator/cri-o/README.md → ....com/kubernetes-incubator/cri-o/README.md b/....com/kubernetes-incubator/cri-o/README.md → ....com/kubernetes-incubator/cri-o/README.md
diff --git a/...ub.com/kubernetes-incubator/cri-o/VERSION → ...ub.com/kubernetes-incubator/cri-o/VERSION b/...ub.com/kubernetes-incubator/cri-o/VERSION → ...ub.com/kubernetes-incubator/cri-o/VERSION
diff --git a/...bernetes-incubator/cri-o/client/client.go → ...bernetes-incubator/cri-o/client/client.go b/...bernetes-incubator/cri-o/client/client.go → ...bernetes-incubator/cri-o/client/client.go
diff --git a/...rnetes-incubator/cri-o/cmd/crio/config.go → ...rnetes-incubator/cri-o/cmd/crio/config.go b/...rnetes-incubator/cri-o/cmd/crio/config.go → ...rnetes-incubator/cri-o/cmd/crio/config.go
diff --git a/...-incubator/cri-o/cmd/crio/daemon_linux.go → ...-incubator/cri-o/cmd/crio/daemon_linux.go b/...-incubator/cri-o/cmd/crio/daemon_linux.go → ...-incubator/cri-o/cmd/crio/daemon_linux.go
diff --git a/...bernetes-incubator/cri-o/cmd/crio/main.go → ...bernetes-incubator/cri-o/cmd/crio/main.go b/...bernetes-incubator/cri-o/cmd/crio/main.go → ...bernetes-incubator/cri-o/cmd/crio/main.go
diff --git a/...-incubator/cri-o/cmd/crioctl/container.go → ...-incubator/cri-o/cmd/crioctl/container.go b/...-incubator/cri-o/cmd/crioctl/container.go → ...-incubator/cri-o/cmd/crioctl/container.go
diff --git a/...etes-incubator/cri-o/cmd/crioctl/image.go → ...etes-incubator/cri-o/cmd/crioctl/image.go b/...etes-incubator/cri-o/cmd/crioctl/image.go → ...etes-incubator/cri-o/cmd/crioctl/image.go
diff --git a/...netes-incubator/cri-o/cmd/crioctl/info.go → ...netes-incubator/cri-o/cmd/crioctl/info.go b/...netes-incubator/cri-o/cmd/crioctl/info.go → ...netes-incubator/cri-o/cmd/crioctl/info.go
diff --git a/...netes-incubator/cri-o/cmd/crioctl/main.go → ...netes-incubator/cri-o/cmd/crioctl/main.go b/...netes-incubator/cri-o/cmd/crioctl/main.go → ...netes-incubator/cri-o/cmd/crioctl/main.go
diff --git a/...es-incubator/cri-o/cmd/crioctl/sandbox.go → ...es-incubator/cri-o/cmd/crioctl/sandbox.go b/...es-incubator/cri-o/cmd/crioctl/sandbox.go → ...es-incubator/cri-o/cmd/crioctl/sandbox.go
diff --git a/...tes-incubator/cri-o/cmd/crioctl/system.go → ...tes-incubator/cri-o/cmd/crioctl/system.go b/...tes-incubator/cri-o/cmd/crioctl/system.go → ...tes-incubator/cri-o/cmd/crioctl/system.go
diff --git a/...rnetes-incubator/cri-o/cmd/kpod/README.md → ...rnetes-incubator/cri-o/cmd/kpod/README.md b/...rnetes-incubator/cri-o/cmd/kpod/README.md → ...rnetes-incubator/cri-o/cmd/kpod/README.md
diff --git a/...rnetes-incubator/cri-o/cmd/kpod/common.go → ...rnetes-incubator/cri-o/cmd/kpod/common.go b/...rnetes-incubator/cri-o/cmd/kpod/common.go → ...rnetes-incubator/cri-o/cmd/kpod/common.go
diff --git a/...s-incubator/cri-o/cmd/kpod/common_test.go → ...s-incubator/cri-o/cmd/kpod/common_test.go b/...s-incubator/cri-o/cmd/kpod/common_test.go → ...s-incubator/cri-o/cmd/kpod/common_test.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/diff.go → ...bernetes-incubator/cri-o/cmd/kpod/diff.go b/...bernetes-incubator/cri-o/cmd/kpod/diff.go → ...bernetes-incubator/cri-o/cmd/kpod/diff.go
diff --git a/...-incubator/cri-o/cmd/kpod/docker/types.go → ...-incubator/cri-o/cmd/kpod/docker/types.go b/...-incubator/cri-o/cmd/kpod/docker/types.go → ...-incubator/cri-o/cmd/kpod/docker/types.go
diff --git a/...rnetes-incubator/cri-o/cmd/kpod/export.go → ...rnetes-incubator/cri-o/cmd/kpod/export.go b/...rnetes-incubator/cri-o/cmd/kpod/export.go → ...rnetes-incubator/cri-o/cmd/kpod/export.go
diff --git a/...cubator/cri-o/cmd/kpod/formats/formats.go → ...cubator/cri-o/cmd/kpod/formats/formats.go b/...cubator/cri-o/cmd/kpod/formats/formats.go → ...cubator/cri-o/cmd/kpod/formats/formats.go
diff --git a/...bator/cri-o/cmd/kpod/formats/templates.go → ...bator/cri-o/cmd/kpod/formats/templates.go b/...bator/cri-o/cmd/kpod/formats/templates.go → ...bator/cri-o/cmd/kpod/formats/templates.go
diff --git a/...netes-incubator/cri-o/cmd/kpod/history.go → ...netes-incubator/cri-o/cmd/kpod/history.go b/...netes-incubator/cri-o/cmd/kpod/history.go → ...netes-incubator/cri-o/cmd/kpod/history.go
diff --git a/...rnetes-incubator/cri-o/cmd/kpod/images.go → ...rnetes-incubator/cri-o/cmd/kpod/images.go b/...rnetes-incubator/cri-o/cmd/kpod/images.go → ...rnetes-incubator/cri-o/cmd/kpod/images.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/info.go → ...bernetes-incubator/cri-o/cmd/kpod/info.go b/...bernetes-incubator/cri-o/cmd/kpod/info.go → ...bernetes-incubator/cri-o/cmd/kpod/info.go
diff --git a/...netes-incubator/cri-o/cmd/kpod/inspect.go → ...netes-incubator/cri-o/cmd/kpod/inspect.go b/...netes-incubator/cri-o/cmd/kpod/inspect.go → ...netes-incubator/cri-o/cmd/kpod/inspect.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/load.go → ...bernetes-incubator/cri-o/cmd/kpod/load.go b/...bernetes-incubator/cri-o/cmd/kpod/load.go → ...bernetes-incubator/cri-o/cmd/kpod/load.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/logs.go → ...bernetes-incubator/cri-o/cmd/kpod/logs.go b/...bernetes-incubator/cri-o/cmd/kpod/logs.go → ...bernetes-incubator/cri-o/cmd/kpod/logs.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/main.go → ...bernetes-incubator/cri-o/cmd/kpod/main.go b/...bernetes-incubator/cri-o/cmd/kpod/main.go → ...bernetes-incubator/cri-o/cmd/kpod/main.go
diff --git a/...ernetes-incubator/cri-o/cmd/kpod/mount.go → ...ernetes-incubator/cri-o/cmd/kpod/mount.go b/...ernetes-incubator/cri-o/cmd/kpod/mount.go → ...ernetes-incubator/cri-o/cmd/kpod/mount.go
diff --git a/...kubernetes-incubator/cri-o/cmd/kpod/ps.go → ...kubernetes-incubator/cri-o/cmd/kpod/ps.go b/...kubernetes-incubator/cri-o/cmd/kpod/ps.go → ...kubernetes-incubator/cri-o/cmd/kpod/ps.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/pull.go → ...bernetes-incubator/cri-o/cmd/kpod/pull.go b/...bernetes-incubator/cri-o/cmd/kpod/pull.go → ...bernetes-incubator/cri-o/cmd/kpod/pull.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/push.go → ...bernetes-incubator/cri-o/cmd/kpod/push.go b/...bernetes-incubator/cri-o/cmd/kpod/push.go → ...bernetes-incubator/cri-o/cmd/kpod/push.go
diff --git a/...rnetes-incubator/cri-o/cmd/kpod/rename.go → ...rnetes-incubator/cri-o/cmd/kpod/rename.go b/...rnetes-incubator/cri-o/cmd/kpod/rename.go → ...rnetes-incubator/cri-o/cmd/kpod/rename.go
diff --git a/...kubernetes-incubator/cri-o/cmd/kpod/rm.go → ...kubernetes-incubator/cri-o/cmd/kpod/rm.go b/...kubernetes-incubator/cri-o/cmd/kpod/rm.go → ...kubernetes-incubator/cri-o/cmd/kpod/rm.go
diff --git a/...ubernetes-incubator/cri-o/cmd/kpod/rmi.go → ...ubernetes-incubator/cri-o/cmd/kpod/rmi.go b/...ubernetes-incubator/cri-o/cmd/kpod/rmi.go → ...ubernetes-incubator/cri-o/cmd/kpod/rmi.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/save.go → ...bernetes-incubator/cri-o/cmd/kpod/save.go b/...bernetes-incubator/cri-o/cmd/kpod/save.go → ...bernetes-incubator/cri-o/cmd/kpod/save.go
diff --git a/...ernetes-incubator/cri-o/cmd/kpod/stats.go → ...ernetes-incubator/cri-o/cmd/kpod/stats.go b/...ernetes-incubator/cri-o/cmd/kpod/stats.go → ...ernetes-incubator/cri-o/cmd/kpod/stats.go
diff --git a/...bernetes-incubator/cri-o/cmd/kpod/stop.go → ...bernetes-incubator/cri-o/cmd/kpod/stop.go b/...bernetes-incubator/cri-o/cmd/kpod/stop.go → ...bernetes-incubator/cri-o/cmd/kpod/stop.go
diff --git a/...ubernetes-incubator/cri-o/cmd/kpod/tag.go → ...ubernetes-incubator/cri-o/cmd/kpod/tag.go b/...ubernetes-incubator/cri-o/cmd/kpod/tag.go → ...ubernetes-incubator/cri-o/cmd/kpod/tag.go
diff --git a/...rnetes-incubator/cri-o/cmd/kpod/umount.go → ...rnetes-incubator/cri-o/cmd/kpod/umount.go b/...rnetes-incubator/cri-o/cmd/kpod/umount.go → ...rnetes-incubator/cri-o/cmd/kpod/umount.go
diff --git a/...netes-incubator/cri-o/cmd/kpod/version.go → ...netes-incubator/cri-o/cmd/kpod/version.go b/...netes-incubator/cri-o/cmd/kpod/version.go → ...netes-incubator/cri-o/cmd/kpod/version.go
diff --git a/...rnetes-incubator/cri-o/code-of-conduct.md → ...rnetes-incubator/cri-o/code-of-conduct.md b/...rnetes-incubator/cri-o/code-of-conduct.md → ...rnetes-incubator/cri-o/code-of-conduct.md
diff --git a/...tes-incubator/cri-o/completions/bash/kpod → ...tes-incubator/cri-o/completions/bash/kpod b/...tes-incubator/cri-o/completions/bash/kpod → ...tes-incubator/cri-o/completions/bash/kpod
diff --git a/...ubernetes-incubator/cri-o/conmon/Makefile → ...ubernetes-incubator/cri-o/conmon/Makefile b/...ubernetes-incubator/cri-o/conmon/Makefile → ...ubernetes-incubator/cri-o/conmon/Makefile
diff --git a/.../kubernetes-incubator/cri-o/conmon/cmsg.c → .../kubernetes-incubator/cri-o/conmon/cmsg.c b/.../kubernetes-incubator/cri-o/conmon/cmsg.c → .../kubernetes-incubator/cri-o/conmon/cmsg.c
diff --git a/.../kubernetes-incubator/cri-o/conmon/cmsg.h → .../kubernetes-incubator/cri-o/conmon/cmsg.h b/.../kubernetes-incubator/cri-o/conmon/cmsg.h → .../kubernetes-incubator/cri-o/conmon/cmsg.h
diff --git a/...ubernetes-incubator/cri-o/conmon/conmon.c → ...ubernetes-incubator/cri-o/conmon/conmon.c b/...ubernetes-incubator/cri-o/conmon/conmon.c → ...ubernetes-incubator/cri-o/conmon/conmon.c
diff --git a/...tor/cri-o/contrib/cni/10-crio-bridge.conf → ...tor/cri-o/contrib/cni/10-crio-bridge.conf b/...tor/cri-o/contrib/cni/10-crio-bridge.conf → ...tor/cri-o/contrib/cni/10-crio-bridge.conf
diff --git a/...ubator/cri-o/contrib/cni/99-loopback.conf → ...ubator/cri-o/contrib/cni/99-loopback.conf b/...ubator/cri-o/contrib/cni/99-loopback.conf → ...ubator/cri-o/contrib/cni/99-loopback.conf
diff --git a/...tes-incubator/cri-o/contrib/cni/README.md → ...tes-incubator/cri-o/contrib/cni/README.md b/...tes-incubator/cri-o/contrib/cni/README.md → ...tes-incubator/cri-o/contrib/cni/README.md
diff --git a/...etes-incubator/cri-o/contrib/rpm/Makefile → ...etes-incubator/cri-o/contrib/rpm/Makefile b/...etes-incubator/cri-o/contrib/rpm/Makefile → ...etes-incubator/cri-o/contrib/rpm/Makefile
diff --git a/...tes-incubator/cri-o/contrib/rpm/crio.spec → ...tes-incubator/cri-o/contrib/rpm/crio.spec b/...tes-incubator/cri-o/contrib/rpm/crio.spec → ...tes-incubator/cri-o/contrib/rpm/crio.spec
diff --git a/...i-o/contrib/systemd/crio-shutdown.service → ...i-o/contrib/systemd/crio-shutdown.service b/...i-o/contrib/systemd/crio-shutdown.service → ...i-o/contrib/systemd/crio-shutdown.service
diff --git a/...ubator/cri-o/contrib/systemd/crio.service → ...ubator/cri-o/contrib/systemd/crio.service b/...ubator/cri-o/contrib/systemd/crio.service → ...ubator/cri-o/contrib/systemd/crio.service
diff --git a/...o/contrib/test/integration/build/bats.yml → ...o/contrib/test/integration/build/bats.yml b/...o/contrib/test/integration/build/bats.yml → ...o/contrib/test/integration/build/bats.yml
diff --git a/.../contrib/test/integration/build/cri-o.yml → .../contrib/test/integration/build/cri-o.yml b/.../contrib/test/integration/build/cri-o.yml → .../contrib/test/integration/build/cri-o.yml
diff --git a/...trib/test/integration/build/cri-tools.yml → ...trib/test/integration/build/cri-tools.yml b/...trib/test/integration/build/cri-tools.yml → ...trib/test/integration/build/cri-tools.yml
diff --git a/...rib/test/integration/build/kubernetes.yml → ...rib/test/integration/build/kubernetes.yml b/...rib/test/integration/build/kubernetes.yml → ...rib/test/integration/build/kubernetes.yml
diff --git a/...ontrib/test/integration/build/plugins.yml → ...ontrib/test/integration/build/plugins.yml b/...ontrib/test/integration/build/plugins.yml → ...ontrib/test/integration/build/plugins.yml
diff --git a/...o/contrib/test/integration/build/runc.yml → ...o/contrib/test/integration/build/runc.yml b/...o/contrib/test/integration/build/runc.yml → ...o/contrib/test/integration/build/runc.yml
diff --git a/...or/cri-o/contrib/test/integration/e2e.yml → ...or/cri-o/contrib/test/integration/e2e.yml b/...or/cri-o/contrib/test/integration/e2e.yml → ...or/cri-o/contrib/test/integration/e2e.yml
diff --git a/...cri-o/contrib/test/integration/golang.yml → ...cri-o/contrib/test/integration/golang.yml b/...cri-o/contrib/test/integration/golang.yml → ...cri-o/contrib/test/integration/golang.yml
diff --git a/...r/cri-o/contrib/test/integration/main.yml → ...r/cri-o/contrib/test/integration/main.yml b/...r/cri-o/contrib/test/integration/main.yml → ...r/cri-o/contrib/test/integration/main.yml
diff --git a/...cri-o/contrib/test/integration/system.yml → ...cri-o/contrib/test/integration/system.yml b/...cri-o/contrib/test/integration/system.yml → ...cri-o/contrib/test/integration/system.yml
diff --git a/...r/cri-o/contrib/test/integration/test.yml → ...r/cri-o/contrib/test/integration/test.yml b/...r/cri-o/contrib/test/integration/test.yml → ...r/cri-o/contrib/test/integration/test.yml
diff --git a/...bator/cri-o/contrib/test/requirements.txt → ...bator/cri-o/contrib/test/requirements.txt b/...bator/cri-o/contrib/test/requirements.txt → ...bator/cri-o/contrib/test/requirements.txt
diff --git a/...i-o/contrib/test/venv-ansible-playbook.sh → ...i-o/contrib/test/venv-ansible-playbook.sh b/...i-o/contrib/test/venv-ansible-playbook.sh → ...i-o/contrib/test/venv-ansible-playbook.sh
diff --git a/...kubernetes-incubator/cri-o/docs/crio.8.md → ...kubernetes-incubator/cri-o/docs/crio.8.md b/...kubernetes-incubator/cri-o/docs/crio.8.md → ...kubernetes-incubator/cri-o/docs/crio.8.md
diff --git a/...netes-incubator/cri-o/docs/crio.conf.5.md → ...netes-incubator/cri-o/docs/crio.conf.5.md b/...netes-incubator/cri-o/docs/crio.conf.5.md → ...netes-incubator/cri-o/docs/crio.conf.5.md
diff --git a/...ernetes-incubator/cri-o/docs/kpod-cp.1.md → ...ernetes-incubator/cri-o/docs/kpod-cp.1.md b/...ernetes-incubator/cri-o/docs/kpod-cp.1.md → ...ernetes-incubator/cri-o/docs/kpod-cp.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-diff.1.md → ...netes-incubator/cri-o/docs/kpod-diff.1.md b/...netes-incubator/cri-o/docs/kpod-diff.1.md → ...netes-incubator/cri-o/docs/kpod-diff.1.md
diff --git a/...tes-incubator/cri-o/docs/kpod-export.1.md → ...tes-incubator/cri-o/docs/kpod-export.1.md b/...tes-incubator/cri-o/docs/kpod-export.1.md → ...tes-incubator/cri-o/docs/kpod-export.1.md
diff --git a/...es-incubator/cri-o/docs/kpod-history.1.md → ...es-incubator/cri-o/docs/kpod-history.1.md b/...es-incubator/cri-o/docs/kpod-history.1.md → ...es-incubator/cri-o/docs/kpod-history.1.md
diff --git a/...tes-incubator/cri-o/docs/kpod-images.1.md → ...tes-incubator/cri-o/docs/kpod-images.1.md b/...tes-incubator/cri-o/docs/kpod-images.1.md → ...tes-incubator/cri-o/docs/kpod-images.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-info.1.md → ...netes-incubator/cri-o/docs/kpod-info.1.md b/...netes-incubator/cri-o/docs/kpod-info.1.md → ...netes-incubator/cri-o/docs/kpod-info.1.md
diff --git a/...es-incubator/cri-o/docs/kpod-inspect.1.md → ...es-incubator/cri-o/docs/kpod-inspect.1.md b/...es-incubator/cri-o/docs/kpod-inspect.1.md → ...es-incubator/cri-o/docs/kpod-inspect.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-load.1.md → ...netes-incubator/cri-o/docs/kpod-load.1.md b/...netes-incubator/cri-o/docs/kpod-load.1.md → ...netes-incubator/cri-o/docs/kpod-load.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-logs.1.md → ...netes-incubator/cri-o/docs/kpod-logs.1.md b/...netes-incubator/cri-o/docs/kpod-logs.1.md → ...netes-incubator/cri-o/docs/kpod-logs.1.md
diff --git a/...etes-incubator/cri-o/docs/kpod-mount.1.md → ...etes-incubator/cri-o/docs/kpod-mount.1.md b/...etes-incubator/cri-o/docs/kpod-mount.1.md → ...etes-incubator/cri-o/docs/kpod-mount.1.md
diff --git a/...ernetes-incubator/cri-o/docs/kpod-ps.1.md → ...ernetes-incubator/cri-o/docs/kpod-ps.1.md b/...ernetes-incubator/cri-o/docs/kpod-ps.1.md → ...ernetes-incubator/cri-o/docs/kpod-ps.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-pull.1.md → ...netes-incubator/cri-o/docs/kpod-pull.1.md b/...netes-incubator/cri-o/docs/kpod-pull.1.md → ...netes-incubator/cri-o/docs/kpod-pull.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-push.1.md → ...netes-incubator/cri-o/docs/kpod-push.1.md b/...netes-incubator/cri-o/docs/kpod-push.1.md → ...netes-incubator/cri-o/docs/kpod-push.1.md
diff --git a/...tes-incubator/cri-o/docs/kpod-rename.1.md → ...tes-incubator/cri-o/docs/kpod-rename.1.md b/...tes-incubator/cri-o/docs/kpod-rename.1.md → ...tes-incubator/cri-o/docs/kpod-rename.1.md
diff --git a/...ernetes-incubator/cri-o/docs/kpod-rm.1.md → ...ernetes-incubator/cri-o/docs/kpod-rm.1.md b/...ernetes-incubator/cri-o/docs/kpod-rm.1.md → ...ernetes-incubator/cri-o/docs/kpod-rm.1.md
diff --git a/...rnetes-incubator/cri-o/docs/kpod-rmi.1.md → ...rnetes-incubator/cri-o/docs/kpod-rmi.1.md b/...rnetes-incubator/cri-o/docs/kpod-rmi.1.md → ...rnetes-incubator/cri-o/docs/kpod-rmi.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-save.1.md → ...netes-incubator/cri-o/docs/kpod-save.1.md b/...netes-incubator/cri-o/docs/kpod-save.1.md → ...netes-incubator/cri-o/docs/kpod-save.1.md
diff --git a/...etes-incubator/cri-o/docs/kpod-stats.1.md → ...etes-incubator/cri-o/docs/kpod-stats.1.md b/...etes-incubator/cri-o/docs/kpod-stats.1.md → ...etes-incubator/cri-o/docs/kpod-stats.1.md
diff --git a/...netes-incubator/cri-o/docs/kpod-stop.1.md → ...netes-incubator/cri-o/docs/kpod-stop.1.md b/...netes-incubator/cri-o/docs/kpod-stop.1.md → ...netes-incubator/cri-o/docs/kpod-stop.1.md
diff --git a/...rnetes-incubator/cri-o/docs/kpod-tag.1.md → ...rnetes-incubator/cri-o/docs/kpod-tag.1.md b/...rnetes-incubator/cri-o/docs/kpod-tag.1.md → ...rnetes-incubator/cri-o/docs/kpod-tag.1.md
diff --git a/...tes-incubator/cri-o/docs/kpod-umount.1.md → ...tes-incubator/cri-o/docs/kpod-umount.1.md b/...tes-incubator/cri-o/docs/kpod-umount.1.md → ...tes-incubator/cri-o/docs/kpod-umount.1.md
diff --git a/...es-incubator/cri-o/docs/kpod-version.1.md → ...es-incubator/cri-o/docs/kpod-version.1.md b/...es-incubator/cri-o/docs/kpod-version.1.md → ...es-incubator/cri-o/docs/kpod-version.1.md
diff --git a/...kubernetes-incubator/cri-o/docs/kpod.1.md → ...kubernetes-incubator/cri-o/docs/kpod.1.md b/...kubernetes-incubator/cri-o/docs/kpod.1.md → ...kubernetes-incubator/cri-o/docs/kpod.1.md
diff --git a/.../kubernetes-incubator/cri-o/docs/play.png → .../kubernetes-incubator/cri-o/docs/play.png b/.../kubernetes-incubator/cri-o/docs/play.png → .../kubernetes-incubator/cri-o/docs/play.png
diff --git a/...ernetes-incubator/cri-o/hack/btrfs_tag.sh → ...ernetes-incubator/cri-o/hack/btrfs_tag.sh b/...ernetes-incubator/cri-o/hack/btrfs_tag.sh → ...ernetes-incubator/cri-o/hack/btrfs_tag.sh
diff --git a/...netes-incubator/cri-o/hack/find-godeps.sh → ...netes-incubator/cri-o/hack/find-godeps.sh b/...netes-incubator/cri-o/hack/find-godeps.sh → ...netes-incubator/cri-o/hack/find-godeps.sh
diff --git a/...ernetes-incubator/cri-o/hack/libdm_tag.sh → ...ernetes-incubator/cri-o/hack/libdm_tag.sh b/...ernetes-incubator/cri-o/hack/libdm_tag.sh → ...ernetes-incubator/cri-o/hack/libdm_tag.sh
diff --git a/...etes-incubator/cri-o/hack/verify-gofmt.sh → ...etes-incubator/cri-o/hack/verify-gofmt.sh b/...etes-incubator/cri-o/hack/verify-gofmt.sh → ...etes-incubator/cri-o/hack/verify-gofmt.sh
diff --git a/...b.com/kubernetes-incubator/cri-o/hooks.md → ...b.com/kubernetes-incubator/cri-o/hooks.md b/...b.com/kubernetes-incubator/cri-o/hooks.md → ...b.com/kubernetes-incubator/cri-o/hooks.md
diff --git a/...bernetes-incubator/cri-o/kpod-images.json → ...bernetes-incubator/cri-o/kpod-images.json b/...bernetes-incubator/cri-o/kpod-images.json → ...bernetes-incubator/cri-o/kpod-images.json
diff --git a/.../kubernetes-incubator/cri-o/kubernetes.md → .../kubernetes-incubator/cri-o/kubernetes.md b/.../kubernetes-incubator/cri-o/kubernetes.md → .../kubernetes-incubator/cri-o/kubernetes.md
diff --git a/...ernetes-incubator/cri-o/libkpod/config.go → ...ernetes-incubator/cri-o/libkpod/config.go b/...ernetes-incubator/cri-o/libkpod/config.go → ...ernetes-incubator/cri-o/libkpod/config.go
diff --git a/...es-incubator/cri-o/libkpod/config_test.go → ...es-incubator/cri-o/libkpod/config_test.go b/...es-incubator/cri-o/libkpod/config_test.go → ...es-incubator/cri-o/libkpod/config_test.go
diff --git a/...etes-incubator/cri-o/libkpod/container.go → ...etes-incubator/cri-o/libkpod/container.go b/...etes-incubator/cri-o/libkpod/container.go → ...etes-incubator/cri-o/libkpod/container.go
diff --git a/...incubator/cri-o/libkpod/container_data.go → ...incubator/cri-o/libkpod/container_data.go b/...incubator/cri-o/libkpod/container_data.go → ...incubator/cri-o/libkpod/container_data.go
diff --git a/...cubator/cri-o/libkpod/container_server.go → ...cubator/cri-o/libkpod/container_server.go b/...cubator/cri-o/libkpod/container_server.go → ...cubator/cri-o/libkpod/container_server.go
diff --git a/...ubernetes-incubator/cri-o/libkpod/diff.go → ...ubernetes-incubator/cri-o/libkpod/diff.go b/...ubernetes-incubator/cri-o/libkpod/diff.go → ...ubernetes-incubator/cri-o/libkpod/diff.go
diff --git a/...bernetes-incubator/cri-o/libkpod/hooks.go → ...bernetes-incubator/cri-o/libkpod/hooks.go b/...bernetes-incubator/cri-o/libkpod/hooks.go → ...bernetes-incubator/cri-o/libkpod/hooks.go
diff --git a/...ubernetes-incubator/cri-o/libkpod/logs.go → ...ubernetes-incubator/cri-o/libkpod/logs.go b/...ubernetes-incubator/cri-o/libkpod/logs.go → ...ubernetes-incubator/cri-o/libkpod/logs.go
diff --git a/...ernetes-incubator/cri-o/libkpod/remove.go → ...ernetes-incubator/cri-o/libkpod/remove.go b/...ernetes-incubator/cri-o/libkpod/remove.go → ...ernetes-incubator/cri-o/libkpod/remove.go
diff --git a/...ernetes-incubator/cri-o/libkpod/rename.go → ...ernetes-incubator/cri-o/libkpod/rename.go b/...ernetes-incubator/cri-o/libkpod/rename.go → ...ernetes-incubator/cri-o/libkpod/rename.go
diff --git a/...ncubator/cri-o/libkpod/sandbox/sandbox.go → ...ncubator/cri-o/libkpod/sandbox/sandbox.go b/...ncubator/cri-o/libkpod/sandbox/sandbox.go → ...ncubator/cri-o/libkpod/sandbox/sandbox.go
diff --git a/...bernetes-incubator/cri-o/libkpod/stats.go → ...bernetes-incubator/cri-o/libkpod/stats.go b/...bernetes-incubator/cri-o/libkpod/stats.go → ...bernetes-incubator/cri-o/libkpod/stats.go
diff --git a/...ubernetes-incubator/cri-o/libkpod/stop.go → ...ubernetes-incubator/cri-o/libkpod/stop.go b/...ubernetes-incubator/cri-o/libkpod/stop.go → ...ubernetes-incubator/cri-o/libkpod/stop.go
diff --git a/...ubator/cri-o/libkpod/testdata/config.toml → ...ubator/cri-o/libkpod/testdata/config.toml b/...ubator/cri-o/libkpod/testdata/config.toml → ...ubator/cri-o/libkpod/testdata/config.toml
diff --git a/...s-incubator/cri-o/libpod/common/common.go → ...s-incubator/cri-o/libpod/common/common.go b/...s-incubator/cri-o/libpod/common/common.go → ...s-incubator/cri-o/libpod/common/common.go
diff --git a/.../libpod/common/docker_registry_options.go → .../libpod/common/docker_registry_options.go b/.../libpod/common/docker_registry_options.go → .../libpod/common/docker_registry_options.go
diff --git a/.../cri-o/libpod/common/output_interfaces.go → .../cri-o/libpod/common/output_interfaces.go b/.../cri-o/libpod/common/output_interfaces.go → .../cri-o/libpod/common/output_interfaces.go
diff --git a/...or/cri-o/libpod/common/signing_options.go → ...or/cri-o/libpod/common/signing_options.go b/...or/cri-o/libpod/common/signing_options.go → ...or/cri-o/libpod/common/signing_options.go
diff --git a/...s-incubator/cri-o/libpod/ctr/container.go → ...s-incubator/cri-o/libpod/ctr/container.go b/...s-incubator/cri-o/libpod/ctr/container.go → ...s-incubator/cri-o/libpod/ctr/container.go
diff --git a/...s-incubator/cri-o/libpod/driver/driver.go → ...s-incubator/cri-o/libpod/driver/driver.go b/...s-incubator/cri-o/libpod/driver/driver.go → ...s-incubator/cri-o/libpod/driver/driver.go
diff --git a/...ubernetes-incubator/cri-o/libpod/image.go → ...ubernetes-incubator/cri-o/libpod/image.go b/...ubernetes-incubator/cri-o/libpod/image.go → ...ubernetes-incubator/cri-o/libpod/image.go
diff --git a/...tes-incubator/cri-o/libpod/images/copy.go → ...tes-incubator/cri-o/libpod/images/copy.go b/...tes-incubator/cri-o/libpod/images/copy.go → ...tes-incubator/cri-o/libpod/images/copy.go
diff --git a/...ncubator/cri-o/libpod/images/copy_data.go → ...ncubator/cri-o/libpod/images/copy_data.go b/...ncubator/cri-o/libpod/images/copy_data.go → ...ncubator/cri-o/libpod/images/copy_data.go
diff --git a/...incubator/cri-o/libpod/images/copy_ref.go → ...incubator/cri-o/libpod/images/copy_ref.go b/...incubator/cri-o/libpod/images/copy_ref.go → ...incubator/cri-o/libpod/images/copy_ref.go
diff --git a/...es-incubator/cri-o/libpod/images/image.go → ...es-incubator/cri-o/libpod/images/image.go b/...es-incubator/cri-o/libpod/images/image.go → ...es-incubator/cri-o/libpod/images/image.go
diff --git a/...cubator/cri-o/libpod/images/image_data.go → ...cubator/cri-o/libpod/images/image_data.go b/...cubator/cri-o/libpod/images/image_data.go → ...cubator/cri-o/libpod/images/image_data.go
diff --git a/...etes-incubator/cri-o/libpod/images/rmi.go → ...etes-incubator/cri-o/libpod/images/rmi.go b/...etes-incubator/cri-o/libpod/images/rmi.go → ...etes-incubator/cri-o/libpod/images/rmi.go
diff --git a/...es-incubator/cri-o/libpod/layers/layer.go → ...es-incubator/cri-o/libpod/layers/layer.go b/...es-incubator/cri-o/libpod/layers/layer.go → ...es-incubator/cri-o/libpod/layers/layer.go
diff --git a/...ernetes-incubator/cri-o/libpod/options.go → ...ernetes-incubator/cri-o/libpod/options.go b/...ernetes-incubator/cri-o/libpod/options.go → ...ernetes-incubator/cri-o/libpod/options.go
diff --git a/...ernetes-incubator/cri-o/libpod/pod/pod.go → ...ernetes-incubator/cri-o/libpod/pod/pod.go b/...ernetes-incubator/cri-o/libpod/pod/pod.go → ...ernetes-incubator/cri-o/libpod/pod/pod.go
diff --git a/...ernetes-incubator/cri-o/libpod/runtime.go → ...ernetes-incubator/cri-o/libpod/runtime.go b/...ernetes-incubator/cri-o/libpod/runtime.go → ...ernetes-incubator/cri-o/libpod/runtime.go
diff --git a/...incubator/cri-o/logo/crio-logo-source.svg → ...incubator/cri-o/logo/crio-logo-source.svg b/...incubator/cri-o/logo/crio-logo-source.svg → ...incubator/cri-o/logo/crio-logo-source.svg
diff --git a/...rnetes-incubator/cri-o/logo/crio-logo.png → ...rnetes-incubator/cri-o/logo/crio-logo.png b/...rnetes-incubator/cri-o/logo/crio-logo.png → ...rnetes-incubator/cri-o/logo/crio-logo.png
diff --git a/...rnetes-incubator/cri-o/logo/crio-logo.svg → ...rnetes-incubator/cri-o/logo/crio-logo.svg b/...rnetes-incubator/cri-o/logo/crio-logo.svg → ...rnetes-incubator/cri-o/logo/crio-logo.svg
diff --git a/...bernetes-incubator/cri-o/oci/container.go → ...bernetes-incubator/cri-o/oci/container.go b/...bernetes-incubator/cri-o/oci/container.go → ...bernetes-incubator/cri-o/oci/container.go
diff --git a/...ubernetes-incubator/cri-o/oci/finished.go → ...ubernetes-incubator/cri-o/oci/finished.go b/...ubernetes-incubator/cri-o/oci/finished.go → ...ubernetes-incubator/cri-o/oci/finished.go
diff --git a/...rnetes-incubator/cri-o/oci/finished_32.go → ...rnetes-incubator/cri-o/oci/finished_32.go b/...rnetes-incubator/cri-o/oci/finished_32.go → ...rnetes-incubator/cri-o/oci/finished_32.go
diff --git a/...kubernetes-incubator/cri-o/oci/history.go → ...kubernetes-incubator/cri-o/oci/history.go b/...kubernetes-incubator/cri-o/oci/history.go → ...kubernetes-incubator/cri-o/oci/history.go
diff --git a/...netes-incubator/cri-o/oci/memory_store.go → ...netes-incubator/cri-o/oci/memory_store.go b/...netes-incubator/cri-o/oci/memory_store.go → ...netes-incubator/cri-o/oci/memory_store.go
diff --git a/...com/kubernetes-incubator/cri-o/oci/oci.go → ...com/kubernetes-incubator/cri-o/oci/oci.go b/...com/kubernetes-incubator/cri-o/oci/oci.go → ...com/kubernetes-incubator/cri-o/oci/oci.go
diff --git a/...m/kubernetes-incubator/cri-o/oci/store.go → ...m/kubernetes-incubator/cri-o/oci/store.go b/...m/kubernetes-incubator/cri-o/oci/store.go → ...m/kubernetes-incubator/cri-o/oci/store.go
diff --git a/...bernetes-incubator/cri-o/pause/.gitignore → ...bernetes-incubator/cri-o/pause/.gitignore b/...bernetes-incubator/cri-o/pause/.gitignore → ...bernetes-incubator/cri-o/pause/.gitignore
diff --git a/...kubernetes-incubator/cri-o/pause/Makefile → ...kubernetes-incubator/cri-o/pause/Makefile b/...kubernetes-incubator/cri-o/pause/Makefile → ...kubernetes-incubator/cri-o/pause/Makefile
diff --git a/.../kubernetes-incubator/cri-o/pause/pause.c → .../kubernetes-incubator/cri-o/pause/pause.c b/.../kubernetes-incubator/cri-o/pause/pause.c → .../kubernetes-incubator/cri-o/pause/pause.c
diff --git a/...ator/cri-o/pkg/annotations/annotations.go → ...ator/cri-o/pkg/annotations/annotations.go b/...ator/cri-o/pkg/annotations/annotations.go → ...ator/cri-o/pkg/annotations/annotations.go
diff --git a/...ncubator/cri-o/pkg/registrar/registrar.go → ...ncubator/cri-o/pkg/registrar/registrar.go b/...ncubator/cri-o/pkg/registrar/registrar.go → ...ncubator/cri-o/pkg/registrar/registrar.go
diff --git a/...tor/cri-o/pkg/registrar/registrar_test.go → ...tor/cri-o/pkg/registrar/registrar_test.go b/...tor/cri-o/pkg/registrar/registrar_test.go → ...tor/cri-o/pkg/registrar/registrar_test.go
diff --git a/...rnetes-incubator/cri-o/pkg/storage/doc.go → ...rnetes-incubator/cri-o/pkg/storage/doc.go b/...rnetes-incubator/cri-o/pkg/storage/doc.go → ...rnetes-incubator/cri-o/pkg/storage/doc.go
diff --git a/...etes-incubator/cri-o/pkg/storage/image.go → ...etes-incubator/cri-o/pkg/storage/image.go b/...etes-incubator/cri-o/pkg/storage/image.go → ...etes-incubator/cri-o/pkg/storage/image.go
diff --git a/...cubator/cri-o/pkg/storage/image_regexp.go → ...cubator/cri-o/pkg/storage/image_regexp.go b/...cubator/cri-o/pkg/storage/image_regexp.go → ...cubator/cri-o/pkg/storage/image_regexp.go
diff --git a/...es-incubator/cri-o/pkg/storage/runtime.go → ...es-incubator/cri-o/pkg/storage/runtime.go b/...es-incubator/cri-o/pkg/storage/runtime.go → ...es-incubator/cri-o/pkg/storage/runtime.go
diff --git a/...m/kubernetes-incubator/cri-o/seccomp.json → ...m/kubernetes-incubator/cri-o/seccomp.json b/...m/kubernetes-incubator/cri-o/seccomp.json → ...m/kubernetes-incubator/cri-o/seccomp.json
diff --git a/...cubator/cri-o/server/apparmor/aaparser.go → ...cubator/cri-o/server/apparmor/aaparser.go b/...cubator/cri-o/server/apparmor/aaparser.go → ...cubator/cri-o/server/apparmor/aaparser.go
diff --git a/.../cri-o/server/apparmor/apparmor_common.go → .../cri-o/server/apparmor/apparmor_common.go b/.../cri-o/server/apparmor/apparmor_common.go → .../cri-o/server/apparmor/apparmor_common.go
diff --git a/...i-o/server/apparmor/apparmor_supported.go → ...i-o/server/apparmor/apparmor_supported.go b/...i-o/server/apparmor/apparmor_supported.go → ...i-o/server/apparmor/apparmor_supported.go
diff --git a/...o/server/apparmor/apparmor_unsupported.go → ...o/server/apparmor/apparmor_unsupported.go b/...o/server/apparmor/apparmor_unsupported.go → ...o/server/apparmor/apparmor_unsupported.go
diff --git a/...cubator/cri-o/server/apparmor/template.go → ...cubator/cri-o/server/apparmor/template.go b/...cubator/cri-o/server/apparmor/template.go → ...cubator/cri-o/server/apparmor/template.go
diff --git a/...bernetes-incubator/cri-o/server/config.go → ...bernetes-incubator/cri-o/server/config.go b/...bernetes-incubator/cri-o/server/config.go → ...bernetes-incubator/cri-o/server/config.go
diff --git a/...ncubator/cri-o/server/container_attach.go → ...ncubator/cri-o/server/container_attach.go b/...ncubator/cri-o/server/container_attach.go → ...ncubator/cri-o/server/container_attach.go
diff --git a/...ncubator/cri-o/server/container_create.go → ...ncubator/cri-o/server/container_create.go b/...ncubator/cri-o/server/container_create.go → ...ncubator/cri-o/server/container_create.go
diff --git a/...-incubator/cri-o/server/container_exec.go → ...-incubator/cri-o/server/container_exec.go b/...-incubator/cri-o/server/container_exec.go → ...-incubator/cri-o/server/container_exec.go
diff --git a/...ubator/cri-o/server/container_execsync.go → ...ubator/cri-o/server/container_execsync.go b/...ubator/cri-o/server/container_execsync.go → ...ubator/cri-o/server/container_execsync.go
diff --git a/...-incubator/cri-o/server/container_list.go → ...-incubator/cri-o/server/container_list.go b/...-incubator/cri-o/server/container_list.go → ...-incubator/cri-o/server/container_list.go
diff --git a/...tor/cri-o/server/container_portforward.go → ...tor/cri-o/server/container_portforward.go b/...tor/cri-o/server/container_portforward.go → ...tor/cri-o/server/container_portforward.go
diff --git a/...ncubator/cri-o/server/container_remove.go → ...ncubator/cri-o/server/container_remove.go b/...ncubator/cri-o/server/container_remove.go → ...ncubator/cri-o/server/container_remove.go
diff --git a/...incubator/cri-o/server/container_start.go → ...incubator/cri-o/server/container_start.go b/...incubator/cri-o/server/container_start.go → ...incubator/cri-o/server/container_start.go
diff --git a/...incubator/cri-o/server/container_stats.go → ...incubator/cri-o/server/container_stats.go b/...incubator/cri-o/server/container_stats.go → ...incubator/cri-o/server/container_stats.go
diff --git a/...ator/cri-o/server/container_stats_list.go → ...ator/cri-o/server/container_stats_list.go b/...ator/cri-o/server/container_stats_list.go → ...ator/cri-o/server/container_stats_list.go
diff --git a/...ncubator/cri-o/server/container_status.go → ...ncubator/cri-o/server/container_status.go b/...ncubator/cri-o/server/container_status.go → ...ncubator/cri-o/server/container_status.go
diff --git a/...-incubator/cri-o/server/container_stop.go → ...-incubator/cri-o/server/container_stop.go b/...-incubator/cri-o/server/container_stop.go → ...-incubator/cri-o/server/container_stop.go
diff --git a/...o/server/container_updateruntimeconfig.go → ...o/server/container_updateruntimeconfig.go b/...o/server/container_updateruntimeconfig.go → ...o/server/container_updateruntimeconfig.go
diff --git a/...s-incubator/cri-o/server/image_fs_info.go → ...s-incubator/cri-o/server/image_fs_info.go b/...s-incubator/cri-o/server/image_fs_info.go → ...s-incubator/cri-o/server/image_fs_info.go
diff --git a/...etes-incubator/cri-o/server/image_list.go → ...etes-incubator/cri-o/server/image_list.go b/...etes-incubator/cri-o/server/image_list.go → ...etes-incubator/cri-o/server/image_list.go
diff --git a/...etes-incubator/cri-o/server/image_pull.go → ...etes-incubator/cri-o/server/image_pull.go b/...etes-incubator/cri-o/server/image_pull.go → ...etes-incubator/cri-o/server/image_pull.go
diff --git a/...es-incubator/cri-o/server/image_remove.go → ...es-incubator/cri-o/server/image_remove.go b/...es-incubator/cri-o/server/image_remove.go → ...es-incubator/cri-o/server/image_remove.go
diff --git a/...es-incubator/cri-o/server/image_status.go → ...es-incubator/cri-o/server/image_status.go b/...es-incubator/cri-o/server/image_status.go → ...es-incubator/cri-o/server/image_status.go
diff --git a/...ernetes-incubator/cri-o/server/inspect.go → ...ernetes-incubator/cri-o/server/inspect.go b/...ernetes-incubator/cri-o/server/inspect.go → ...ernetes-incubator/cri-o/server/inspect.go
diff --git a/...es-incubator/cri-o/server/inspect_test.go → ...es-incubator/cri-o/server/inspect_test.go b/...es-incubator/cri-o/server/inspect_test.go → ...es-incubator/cri-o/server/inspect_test.go
diff --git a/...bernetes-incubator/cri-o/server/naming.go → ...bernetes-incubator/cri-o/server/naming.go b/...bernetes-incubator/cri-o/server/naming.go → ...bernetes-incubator/cri-o/server/naming.go
diff --git a/...-incubator/cri-o/server/runtime_status.go → ...-incubator/cri-o/server/runtime_status.go b/...-incubator/cri-o/server/runtime_status.go → ...-incubator/cri-o/server/runtime_status.go
diff --git a/...es-incubator/cri-o/server/sandbox_list.go → ...es-incubator/cri-o/server/sandbox_list.go b/...es-incubator/cri-o/server/sandbox_list.go → ...es-incubator/cri-o/server/sandbox_list.go
diff --git a/...incubator/cri-o/server/sandbox_network.go → ...incubator/cri-o/server/sandbox_network.go b/...incubator/cri-o/server/sandbox_network.go → ...incubator/cri-o/server/sandbox_network.go
diff --git a/...-incubator/cri-o/server/sandbox_remove.go → ...-incubator/cri-o/server/sandbox_remove.go b/...-incubator/cri-o/server/sandbox_remove.go → ...-incubator/cri-o/server/sandbox_remove.go
diff --git a/...tes-incubator/cri-o/server/sandbox_run.go → ...tes-incubator/cri-o/server/sandbox_run.go b/...tes-incubator/cri-o/server/sandbox_run.go → ...tes-incubator/cri-o/server/sandbox_run.go
diff --git a/...-incubator/cri-o/server/sandbox_status.go → ...-incubator/cri-o/server/sandbox_status.go b/...-incubator/cri-o/server/sandbox_status.go → ...-incubator/cri-o/server/sandbox_status.go
diff --git a/...es-incubator/cri-o/server/sandbox_stop.go → ...es-incubator/cri-o/server/sandbox_stop.go b/...es-incubator/cri-o/server/sandbox_stop.go → ...es-incubator/cri-o/server/sandbox_stop.go
diff --git a/...incubator/cri-o/server/seccomp/seccomp.go → ...incubator/cri-o/server/seccomp/seccomp.go b/...incubator/cri-o/server/seccomp/seccomp.go → ...incubator/cri-o/server/seccomp/seccomp.go
diff --git a/...i-o/server/seccomp/seccomp_unsupported.go → ...i-o/server/seccomp/seccomp_unsupported.go b/...i-o/server/seccomp/seccomp_unsupported.go → ...i-o/server/seccomp/seccomp_unsupported.go
diff --git a/...s-incubator/cri-o/server/seccomp/types.go → ...s-incubator/cri-o/server/seccomp/types.go b/...s-incubator/cri-o/server/seccomp/types.go → ...s-incubator/cri-o/server/seccomp/types.go
diff --git a/...bernetes-incubator/cri-o/server/server.go → ...bernetes-incubator/cri-o/server/server.go b/...bernetes-incubator/cri-o/server/server.go → ...bernetes-incubator/cri-o/server/server.go
diff --git a/...ubernetes-incubator/cri-o/server/utils.go → ...ubernetes-incubator/cri-o/server/utils.go b/...ubernetes-incubator/cri-o/server/utils.go → ...ubernetes-incubator/cri-o/server/utils.go
diff --git a/...ernetes-incubator/cri-o/server/version.go → ...ernetes-incubator/cri-o/server/version.go b/...ernetes-incubator/cri-o/server/version.go → ...ernetes-incubator/cri-o/server/version.go
diff --git a/...kubernetes-incubator/cri-o/test/README.md → ...kubernetes-incubator/cri-o/test/README.md b/...kubernetes-incubator/cri-o/test/README.md → ...kubernetes-incubator/cri-o/test/README.md
diff --git a/...rnetes-incubator/cri-o/test/apparmor.bats → ...rnetes-incubator/cri-o/test/apparmor.bats b/...rnetes-incubator/cri-o/test/apparmor.bats → ...rnetes-incubator/cri-o/test/apparmor.bats
diff --git a/...s-incubator/cri-o/test/bin2img/bin2img.go → ...s-incubator/cri-o/test/bin2img/bin2img.go b/...s-incubator/cri-o/test/bin2img/bin2img.go → ...s-incubator/cri-o/test/bin2img/bin2img.go
diff --git a/...ernetes-incubator/cri-o/test/cgroups.bats → ...ernetes-incubator/cri-o/test/cgroups.bats b/...ernetes-incubator/cri-o/test/cgroups.bats → ...ernetes-incubator/cri-o/test/cgroups.bats
diff --git a/...r/cri-o/test/checkseccomp/checkseccomp.go → ...r/cri-o/test/checkseccomp/checkseccomp.go b/...r/cri-o/test/checkseccomp/checkseccomp.go → ...r/cri-o/test/checkseccomp/checkseccomp.go
diff --git a/...s-incubator/cri-o/test/copyimg/copyimg.go → ...s-incubator/cri-o/test/copyimg/copyimg.go b/...s-incubator/cri-o/test/copyimg/copyimg.go → ...s-incubator/cri-o/test/copyimg/copyimg.go
diff --git a/.../kubernetes-incubator/cri-o/test/ctr.bats → .../kubernetes-incubator/cri-o/test/ctr.bats b/.../kubernetes-incubator/cri-o/test/ctr.bats → .../kubernetes-incubator/cri-o/test/ctr.bats
diff --git a/...ernetes-incubator/cri-o/test/helpers.bash → ...ernetes-incubator/cri-o/test/helpers.bash b/...ernetes-incubator/cri-o/test/helpers.bash → ...ernetes-incubator/cri-o/test/helpers.bash
diff --git a/...ubernetes-incubator/cri-o/test/hooks.bats → ...ubernetes-incubator/cri-o/test/hooks.bats b/...ubernetes-incubator/cri-o/test/hooks.bats → ...ubernetes-incubator/cri-o/test/hooks.bats
diff --git a/...incubator/cri-o/test/hooks/checkhook.json → ...incubator/cri-o/test/hooks/checkhook.json b/...incubator/cri-o/test/hooks/checkhook.json → ...incubator/cri-o/test/hooks/checkhook.json
diff --git a/...s-incubator/cri-o/test/hooks/checkhook.sh → ...s-incubator/cri-o/test/hooks/checkhook.sh b/...s-incubator/cri-o/test/hooks/checkhook.sh → ...s-incubator/cri-o/test/hooks/checkhook.sh
diff --git a/...ubernetes-incubator/cri-o/test/image.bats → ...ubernetes-incubator/cri-o/test/image.bats b/...ubernetes-incubator/cri-o/test/image.bats → ...ubernetes-incubator/cri-o/test/image.bats
diff --git a/...es-incubator/cri-o/test/image_volume.bats → ...es-incubator/cri-o/test/image_volume.bats b/...es-incubator/cri-o/test/image_volume.bats → ...es-incubator/cri-o/test/image_volume.bats
diff --git a/...ernetes-incubator/cri-o/test/inspect.bats → ...ernetes-incubator/cri-o/test/inspect.bats b/...ernetes-incubator/cri-o/test/inspect.bats → ...ernetes-incubator/cri-o/test/inspect.bats
diff --git a/...kubernetes-incubator/cri-o/test/kpod.bats → ...kubernetes-incubator/cri-o/test/kpod.bats b/...kubernetes-incubator/cri-o/test/kpod.bats → ...kubernetes-incubator/cri-o/test/kpod.bats
diff --git a/...netes-incubator/cri-o/test/kpod_diff.bats → ...netes-incubator/cri-o/test/kpod_diff.bats b/...netes-incubator/cri-o/test/kpod_diff.bats → ...netes-incubator/cri-o/test/kpod_diff.bats
diff --git a/...tes-incubator/cri-o/test/kpod_export.bats → ...tes-incubator/cri-o/test/kpod_export.bats b/...tes-incubator/cri-o/test/kpod_export.bats → ...tes-incubator/cri-o/test/kpod_export.bats
diff --git a/...netes-incubator/cri-o/test/kpod_load.bats → ...netes-incubator/cri-o/test/kpod_load.bats b/...netes-incubator/cri-o/test/kpod_load.bats → ...netes-incubator/cri-o/test/kpod_load.bats
diff --git a/...netes-incubator/cri-o/test/kpod_logs.bats → ...netes-incubator/cri-o/test/kpod_logs.bats b/...netes-incubator/cri-o/test/kpod_logs.bats → ...netes-incubator/cri-o/test/kpod_logs.bats
diff --git a/...etes-incubator/cri-o/test/kpod_mount.bats → ...etes-incubator/cri-o/test/kpod_mount.bats b/...etes-incubator/cri-o/test/kpod_mount.bats → ...etes-incubator/cri-o/test/kpod_mount.bats
diff --git a/...ernetes-incubator/cri-o/test/kpod_ps.bats → ...ernetes-incubator/cri-o/test/kpod_ps.bats b/...ernetes-incubator/cri-o/test/kpod_ps.bats → ...ernetes-incubator/cri-o/test/kpod_ps.bats
diff --git a/...netes-incubator/cri-o/test/kpod_pull.bats → ...netes-incubator/cri-o/test/kpod_pull.bats b/...netes-incubator/cri-o/test/kpod_pull.bats → ...netes-incubator/cri-o/test/kpod_pull.bats
diff --git a/...tes-incubator/cri-o/test/kpod_rename.bats → ...tes-incubator/cri-o/test/kpod_rename.bats b/...tes-incubator/cri-o/test/kpod_rename.bats → ...tes-incubator/cri-o/test/kpod_rename.bats
diff --git a/...ernetes-incubator/cri-o/test/kpod_rm.bats → ...ernetes-incubator/cri-o/test/kpod_rm.bats b/...ernetes-incubator/cri-o/test/kpod_rm.bats → ...ernetes-incubator/cri-o/test/kpod_rm.bats
diff --git a/...netes-incubator/cri-o/test/kpod_save.bats → ...netes-incubator/cri-o/test/kpod_save.bats b/...netes-incubator/cri-o/test/kpod_save.bats → ...netes-incubator/cri-o/test/kpod_save.bats
diff --git a/...etes-incubator/cri-o/test/kpod_stats.bats → ...etes-incubator/cri-o/test/kpod_stats.bats b/...etes-incubator/cri-o/test/kpod_stats.bats → ...etes-incubator/cri-o/test/kpod_stats.bats
diff --git a/...netes-incubator/cri-o/test/kpod_stop.bats → ...netes-incubator/cri-o/test/kpod_stop.bats b/...netes-incubator/cri-o/test/kpod_stop.bats → ...netes-incubator/cri-o/test/kpod_stop.bats
diff --git a/...ernetes-incubator/cri-o/test/network.bats → ...ernetes-incubator/cri-o/test/network.bats b/...ernetes-incubator/cri-o/test/network.bats → ...ernetes-incubator/cri-o/test/network.bats
diff --git a/.../kubernetes-incubator/cri-o/test/pod.bats → .../kubernetes-incubator/cri-o/test/pod.bats b/.../kubernetes-incubator/cri-o/test/pod.bats → .../kubernetes-incubator/cri-o/test/pod.bats
diff --git a/...bernetes-incubator/cri-o/test/policy.json → ...bernetes-incubator/cri-o/test/policy.json b/...bernetes-incubator/cri-o/test/policy.json → ...bernetes-incubator/cri-o/test/policy.json
diff --git a/...incubator/cri-o/test/redhat_sigstore.yaml → ...incubator/cri-o/test/redhat_sigstore.yaml b/...incubator/cri-o/test/redhat_sigstore.yaml → ...incubator/cri-o/test/redhat_sigstore.yaml
diff --git a/...etes-incubator/cri-o/test/registries.conf → ...etes-incubator/cri-o/test/registries.conf b/...etes-incubator/cri-o/test/registries.conf → ...etes-incubator/cri-o/test/registries.conf
diff --git a/...ernetes-incubator/cri-o/test/restore.bats → ...ernetes-incubator/cri-o/test/restore.bats b/...ernetes-incubator/cri-o/test/restore.bats → ...ernetes-incubator/cri-o/test/restore.bats
diff --git a/...-incubator/cri-o/test/runtimeversion.bats → ...-incubator/cri-o/test/runtimeversion.bats b/...-incubator/cri-o/test/runtimeversion.bats → ...-incubator/cri-o/test/runtimeversion.bats
diff --git a/...ernetes-incubator/cri-o/test/seccomp.bats → ...ernetes-incubator/cri-o/test/seccomp.bats b/...ernetes-incubator/cri-o/test/seccomp.bats → ...ernetes-incubator/cri-o/test/seccomp.bats
diff --git a/...ernetes-incubator/cri-o/test/selinux.bats → ...ernetes-incubator/cri-o/test/selinux.bats b/...ernetes-incubator/cri-o/test/selinux.bats → ...ernetes-incubator/cri-o/test/selinux.bats
diff --git a/.../kubernetes-incubator/cri-o/test/tag.bats → .../kubernetes-incubator/cri-o/test/tag.bats b/.../kubernetes-incubator/cri-o/test/tag.bats → .../kubernetes-incubator/cri-o/test/tag.bats
diff --git a/...netes-incubator/cri-o/test/test_runner.sh → ...netes-incubator/cri-o/test/test_runner.sh b/...netes-incubator/cri-o/test/test_runner.sh → ...netes-incubator/cri-o/test/test_runner.sh
diff --git a/...s-incubator/cri-o/test/testdata/README.md → ...s-incubator/cri-o/test/testdata/README.md b/...s-incubator/cri-o/test/testdata/README.md → ...s-incubator/cri-o/test/testdata/README.md
diff --git a/...-o/test/testdata/apparmor_test_deny_write → ...-o/test/testdata/apparmor_test_deny_write b/...-o/test/testdata/apparmor_test_deny_write → ...-o/test/testdata/apparmor_test_deny_write
diff --git a/...cri-o/test/testdata/container_config.json → ...cri-o/test/testdata/container_config.json b/...cri-o/test/testdata/container_config.json → ...cri-o/test/testdata/container_config.json
diff --git a/...testdata/container_config_by_imageid.json → ...testdata/container_config_by_imageid.json b/...testdata/container_config_by_imageid.json → ...testdata/container_config_by_imageid.json
diff --git a/...t/testdata/container_config_hostport.json → ...t/testdata/container_config_hostport.json b/...t/testdata/container_config_hostport.json → ...t/testdata/container_config_hostport.json
diff --git a/...st/testdata/container_config_logging.json → ...st/testdata/container_config_logging.json b/...st/testdata/container_config_logging.json → ...st/testdata/container_config_logging.json
diff --git a/...testdata/container_config_resolvconf.json → ...testdata/container_config_resolvconf.json b/...testdata/container_config_resolvconf.json → ...testdata/container_config_resolvconf.json
diff --git a/...tdata/container_config_resolvconf_ro.json → ...tdata/container_config_resolvconf_ro.json b/...tdata/container_config_resolvconf_ro.json → ...tdata/container_config_resolvconf_ro.json
diff --git a/...st/testdata/container_config_seccomp.json → ...st/testdata/container_config_seccomp.json b/...st/testdata/container_config_seccomp.json → ...st/testdata/container_config_seccomp.json
diff --git a/...-o/test/testdata/container_exit_test.json → ...-o/test/testdata/container_exit_test.json b/...-o/test/testdata/container_exit_test.json → ...-o/test/testdata/container_exit_test.json
diff --git a/.../cri-o/test/testdata/container_redis.json → .../cri-o/test/testdata/container_redis.json b/.../cri-o/test/testdata/container_redis.json → .../cri-o/test/testdata/container_redis.json
diff --git a/...test/testdata/container_redis_device.json → ...test/testdata/container_redis_device.json b/...test/testdata/container_redis_device.json → ...test/testdata/container_redis_device.json
diff --git a/...tor/cri-o/test/testdata/fake_ocid_default → ...tor/cri-o/test/testdata/fake_ocid_default b/...tor/cri-o/test/testdata/fake_ocid_default → ...tor/cri-o/test/testdata/fake_ocid_default
diff --git a/...r/cri-o/test/testdata/sandbox_config.json → ...r/cri-o/test/testdata/sandbox_config.json b/...r/cri-o/test/testdata/sandbox_config.json → ...r/cri-o/test/testdata/sandbox_config.json
diff --git a/...test/testdata/sandbox_config_hostnet.json → ...test/testdata/sandbox_config_hostnet.json b/...test/testdata/sandbox_config_hostnet.json → ...test/testdata/sandbox_config_hostnet.json
diff --git a/...est/testdata/sandbox_config_hostport.json → ...est/testdata/sandbox_config_hostport.json b/...est/testdata/sandbox_config_hostport.json → ...est/testdata/sandbox_config_hostport.json
diff --git a/...test/testdata/sandbox_config_seccomp.json → ...test/testdata/sandbox_config_seccomp.json b/...test/testdata/sandbox_config_seccomp.json → ...test/testdata/sandbox_config_seccomp.json
diff --git a/...test/testdata/sandbox_config_selinux.json → ...test/testdata/sandbox_config_selinux.json b/...test/testdata/sandbox_config_selinux.json → ...test/testdata/sandbox_config_selinux.json
diff --git a/...om/kubernetes-incubator/cri-o/transfer.md → ...om/kubernetes-incubator/cri-o/transfer.md b/...om/kubernetes-incubator/cri-o/transfer.md → ...om/kubernetes-incubator/cri-o/transfer.md
diff --git a/...om/kubernetes-incubator/cri-o/tutorial.md → ...om/kubernetes-incubator/cri-o/tutorial.md b/...om/kubernetes-incubator/cri-o/tutorial.md → ...om/kubernetes-incubator/cri-o/tutorial.md
diff --git a/...kubernetes-incubator/cri-o/types/types.go → ...kubernetes-incubator/cri-o/types/types.go b/...kubernetes-incubator/cri-o/types/types.go → ...kubernetes-incubator/cri-o/types/types.go
diff --git a/...kubernetes-incubator/cri-o/utils/utils.go → ...kubernetes-incubator/cri-o/utils/utils.go b/...kubernetes-incubator/cri-o/utils/utils.go → ...kubernetes-incubator/cri-o/utils/utils.go
diff --git a/...om/kubernetes-incubator/cri-o/vendor.conf → ...om/kubernetes-incubator/cri-o/vendor.conf b/...om/kubernetes-incubator/cri-o/vendor.conf → ...om/kubernetes-incubator/cri-o/vendor.conf
diff --git a/vendor/github.com/containers/storage/.gitignore b/vendor/github.com/containers/storage/.gitignore
diff --git a/vendor/github.com/containers/storage/.travis.yml b/vendor/github.com/containers/storage/.travis.yml
diff --git a/vendor/github.com/containers/storage/CONTRIBUTING.md b/vendor/github.com/containers/storage/CONTRIBUTING.md
diff --git a/vendor/github.com/containers/storage/Makefile b/vendor/github.com/containers/storage/Makefile