Skip to content

Commit

Permalink
Merge pull request #165 from dmage/new-branch-4.0
Browse files Browse the repository at this point in the history
Bump k8s and OpenShift, use new docker-distribution branch
  • Loading branch information
openshift-merge-robot committed Feb 26, 2019
2 parents 75a1fbe + 1dc4cdf commit afcc7da
Show file tree
Hide file tree
Showing 1,545 changed files with 119,846 additions and 51,953 deletions.
43 changes: 25 additions & 18 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 27 additions & 9 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ import:

# docker first
- package: github.com/docker/distribution
version: image-registry-3.11
version: image-registry-4.0-distribution-16128bb
repo: git@github.com:openshift/docker-distribution

# kube second
- package: k8s.io/apimachinery
version: origin-3.11-kubernetes-1.11.1
version: origin-4.0-kubernetes-1.12.4
repo: git@github.com:openshift/kubernetes-apimachinery
- package: k8s.io/client-go
version: origin-3.11-kubernetes-1.11.1
version: origin-4.0-kubernetes-1.12.4
repo: git@github.com:openshift/kubernetes-client-go
- package: k8s.io/metrics
version: origin-3.11-kubernetes-1.11.1
version: origin-4.0-kubernetes-1.12.4
repo: git@github.com:openshift/kubernetes-metrics
- package: k8s.io/apiserver
version: origin-3.11-kubernetes-1.11.1
version: origin-4.0-kubernetes-1.12.4
repo: git@github.com:openshift/kubernetes-apiserver
- package: k8s.io/api
version: origin-3.11-kubernetes-1.11.1
version: origin-4.0-kubernetes-1.12.4
repo: git@github.com:openshift/kubernetes-api
- package: k8s.io/apiextensions-apiserver
version: origin-3.11-kubernetes-1.11.1
version: origin-4.0-kubernetes-1.12.4
repo: git@github.com:openshift/kubernetes-apiextensions-apiserver

# openshift third
Expand All @@ -34,9 +34,7 @@ import:
- package: github.com/openshift/library-go
version: master


# everything else last
#
- package: github.com/google/certificate-transparency
repo: git@github.com:openshift/google-certificate-transparency
- package: github.com/google/cadvisor
Expand Down Expand Up @@ -64,3 +62,23 @@ import:
version: 16.2.1
- package: github.com/gorilla/mux
version: 1.4.0

# pin the latest tested version so you can `glide up -v` to bump only one package
- package: github.com/docker/go-metrics
version: 399ea8c73916000c64c2c76e8da00ca82f8387ab
- package: github.com/docker/go-units
version: 47565b4f722fb6ceae66b95f853feed578a4a51c
- package: github.com/go-ini/ini
version: fa25069db393aecc09b71267d0489b357781c860
- package: github.com/Microsoft/go-winio
version: 97e4973ce50b2ff5f09635a57e2b88a037aae829
- package: github.com/opencontainers/go-digest
version: c9281466c8b2f606084ac71339773efd177436e7
- package: github.com/opencontainers/image-spec
version: 7b1e489870acb042978a3935d2fb76f8a79aff81
- package: github.com/opencontainers/runc
version: 00dc70017d222b178a002ed30e9321b12647af2d
- package: github.com/pkg/profile
version: 057bc52a47ec3c79498dda63f4a6f8298725e976
- package: github.com/satori/go.uuid
version: 36e9d2ebbde5e3f13ab2e25625fd453271d6522e
117 changes: 117 additions & 0 deletions vendor/github.com/Azure/go-autorest/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/github.com/Azure/go-autorest/autorest/adal/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit afcc7da

Please sign in to comment.