diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-21 17:13:14 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-21 17:13:14 -0800 |
commit | 7d2dee36a6b49d335693c0e8554b378f62c7431e (patch) | |
tree | d7dff231e4b50ad3d9df53d2d2291b16ec8cfb82 /roles/calico/meta | |
parent | 2c8ad8c97c2d4ac2778eb2127250e261a1f26113 (diff) | |
parent | 0d79c5282302517861936ecf608fb99d4390446d (diff) | |
download | openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.tar.gz openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.tar.bz2 openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.tar.xz openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.zip |
Merge pull request #6542 from smarterclayton/fix_dockerfile
Automatic merge from submit-queue.
Must directly specify google-cloud-sdk version
The upstream forces versions on packages, and rpm -V fails when it does
not match. Also add which, used by gcloud.
Fixes break https://ci.openshift.redhat.com/jenkins/job/build-and-release-latest-openshift-ansible-images/210/console
Diffstat (limited to 'roles/calico/meta')
0 files changed, 0 insertions, 0 deletions