glide updates
@@ -35,7 +35,7 @@ import:
version: release-1.9.1
- package: k8s.io/kubernetes
repo: git@github.com:openshift/kubernetes
- version: release-1.9.1
+ version: origin-3.10-kubernetes-1.9.1
# openshift second
- package: github.com/openshift/api
@@ -76,7 +76,7 @@ import:
# pod - sjenning
- package: github.com/opencontainers/runc
repo: git@github.com:openshift/opencontainers-runc
- version: openshift-3.9
+ version: openshift-3.10
# pod - sjenning
- package: github.com/google/cadvisor
repo: git@github.com:openshift/google-cadvisor
@@ -85,6 +85,10 @@ import:
- package: github.com/docker/distribution
repo: git@github.com:openshift/docker-distribution
version: release-2.6.0
+# close-write carry
+- package: github.com/docker/docker
+ repo: git@github.com:openshift/moby-moby
+ version: openshift-3.10-docker-b68221c
# ours: shared with kube, but forced by openshift
# master
@@ -163,9 +167,6 @@ import:
# router metrics
- package: github.com/cockroachdb/cmux
version: b64f5908f4945f4b11ed4a0a9d3cc1e23350866d
-# fsouza and to limit dependencies
-- package: github.com/docker/docker
- version: b68221c37ee597950364788204546f9c9d0e46a1
# keep us up to date with latest DNS security fixes
- package: github.com/miekg/dns
version: master
