summaryrefslogtreecommitdiffstats
path: root/roles/calico
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-02 18:56:31 -0800
committerGitHub <noreply@github.com>2018-01-02 18:56:31 -0800
commit861b8620e45008df6cac601725b5a82e9f67907a (patch)
tree97736e0921adcac3a64798554dd10048727e561b /roles/calico
parent3fda828a7ec8a234c309d99cd885f110c570bea2 (diff)
parent46b5705f220022b9eee20f682a330558f9e60258 (diff)
downloadopenshift-861b8620e45008df6cac601725b5a82e9f67907a.tar.gz
openshift-861b8620e45008df6cac601725b5a82e9f67907a.tar.bz2
openshift-861b8620e45008df6cac601725b5a82e9f67907a.tar.xz
openshift-861b8620e45008df6cac601725b5a82e9f67907a.zip
Merge pull request #6583 from mgugino-upstream-stage/aws-creds-location
Automatic merge from submit-queue. Correct kublet_args cloud-provider directories This commit updates kublet_args to correct cloudprovider configuration file locaitons. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1527203
Diffstat (limited to 'roles/calico')
0 files changed, 0 insertions, 0 deletions