summaryrefslogtreecommitdiffstats
path: root/roles/contiv/templates/api-proxy-daemonset.yml.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-14 15:49:24 -0800
committerGitHub <noreply@github.com>2018-02-14 15:49:24 -0800
commit5160996a7bca9053720cd6230537f7acacaa2134 (patch)
tree48a1b268770bc3d8d4818c5cc2bc9fa5ceb2e36b /roles/contiv/templates/api-proxy-daemonset.yml.j2
parentb62c397f0625b9ff3654347a1777ed2277942712 (diff)
parent3db1b63ab35cac6821c8795f7a84ef51407fbb6f (diff)
downloadopenshift-5160996a7bca9053720cd6230537f7acacaa2134.tar.gz
openshift-5160996a7bca9053720cd6230537f7acacaa2134.tar.bz2
openshift-5160996a7bca9053720cd6230537f7acacaa2134.tar.xz
openshift-5160996a7bca9053720cd6230537f7acacaa2134.zip
Merge pull request #7155 from enj/enj/i/revert_overwrite_certs/1512825
Automatic merge from submit-queue. Revert "Bug 1512825 - add mux pod failed for Serial number 02 has already been issued" @sdodson @nhosoi This reverts #6798 as we are not changing the default in origin https://github.com/openshift/origin/pull/18405. This reverts commit ac23e6e362d8758032c1dd573d0ff6a958445df5. That commit introduced a backwards incompatible change to how the commands run. This undoes that. The original change was not required to prevent overwriting of the serial file. Bug 1512825
Diffstat (limited to 'roles/contiv/templates/api-proxy-daemonset.yml.j2')
0 files changed, 0 insertions, 0 deletions