summaryrefslogtreecommitdiffstats
path: root/roles/etcd/templates/etcd.conf.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-26 22:21:52 -0800
committerGitHub <noreply@github.com>2018-01-26 22:21:52 -0800
commit6e619ffbe8511689cae5e38ec644fffe01188a0d (patch)
treea9887073a6a16aea71659244dd38dc0d6228052a /roles/etcd/templates/etcd.conf.j2
parente0a0ad8f7cc6813be492e7368fac6ceac2aef8bf (diff)
parentbb111d7059c948ef305564fd6ac78f53a7ec46ce (diff)
downloadopenshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.tar.gz
openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.tar.bz2
openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.tar.xz
openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.zip
Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tag
Automatic merge from submit-queue. Correct 3.7 to 3.9 upgrade openshift_image_tag Due to complexities upgrading two versions at the same time, openshift_image_tag was being set incorrectly during control_plane upgrades. This commit ensures that openshift_image_tag is set correctly during this process. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
Diffstat (limited to 'roles/etcd/templates/etcd.conf.j2')
0 files changed, 0 insertions, 0 deletions