diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-08 12:46:52 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-08 12:46:52 -0800 |
commit | 74294d8258a4812752434feaf4cd4b512a992af8 (patch) | |
tree | 7c2b4fc5a821831331854e2ba557391118f5341f /roles/calico_master/defaults | |
parent | 0e6fa54388f0adec95bbed79f9fb4f42b6d89fa2 (diff) | |
parent | b7833d6684a238713821cc5e0eb2fa7be99c8197 (diff) | |
download | openshift-74294d8258a4812752434feaf4cd4b512a992af8.tar.gz openshift-74294d8258a4812752434feaf4cd4b512a992af8.tar.bz2 openshift-74294d8258a4812752434feaf4cd4b512a992af8.tar.xz openshift-74294d8258a4812752434feaf4cd4b512a992af8.zip |
Merge pull request #6580 from tomassedovic/openstack-fixes
Automatic merge from submit-queue.
Openstack fixes
This includes a few fixes for the OpenStack provider.
It should fix #6555 and possibly also #6560.
Diffstat (limited to 'roles/calico_master/defaults')
0 files changed, 0 insertions, 0 deletions