summaryrefslogtreecommitdiffstats
path: root/roles/etcd/templates/custom.conf.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-31 11:33:16 -0700
committerGitHub <noreply@github.com>2017-10-31 11:33:16 -0700
commit4a7f64a2d692ebbeb03d696b648762f4be784f6d (patch)
treee2e7b94a738b5dc657b4ee7d00b28f6f7ad60db5 /roles/etcd/templates/custom.conf.j2
parent3e2f7911f08504e7da8344df28f008a81897c329 (diff)
parent971e224650387a873e01af29bf135f47ab2f6980 (diff)
downloadopenshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.gz
openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.bz2
openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.xz
openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.zip
Merge pull request #5924 from smarterclayton/bootstrap_cleanup
Automatic merge from submit-queue. GCP cannot use growpart utils from AWS due to conflicting package Allow cloud provider specific packages to be specified. Also, fix a wait condition in openshift_gcp to allow masters to be bootstrapped nodes. @kwoodson
Diffstat (limited to 'roles/etcd/templates/custom.conf.j2')
0 files changed, 0 insertions, 0 deletions