Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

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

64 changes: 38 additions & 26 deletions glide.lock

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

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ import:
version: origin-4.3-kubernetes-1.16.0-rc.2
- package: k8s.io/kubernetes
repo: https://github.com/openshift/kubernetes.git
version: origin-4.3-kubernetes-1.16.0-rc.2
version: origin-4.3-kubernetes-1.16.2
# this matches the 1.16 branch from kube
- package: k8s.io/gengo
version: 26a664648505d962332bda642b27306bc10d1082
Expand Down
2 changes: 1 addition & 1 deletion images/hyperkube/Dockerfile.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ COPY --from=builder /tmp/build/hyperkube /usr/bin/
LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
io.openshift.tags="openshift,hyperkube" \
io.openshift.build.versions="kubernetes=1.16.0"
io.openshift.build.versions="kubernetes=1.16.2"
3 changes: 0 additions & 3 deletions vendor/OWNERS

This file was deleted.

Loading