summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates/systemcontainercustom.conf.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-31 11:33:20 -0700
committerGitHub <noreply@github.com>2017-10-31 11:33:20 -0700
commitfffb5e5e516d018a8d4bd063bc439a0a81447e31 (patch)
treea156ce3c30624db5134d7a49514fac6baa08f8f0 /roles/docker/templates/systemcontainercustom.conf.j2
parent4a7f64a2d692ebbeb03d696b648762f4be784f6d (diff)
parentf760a66e8df431336c108dcfee8168b97b1f02d5 (diff)
downloadopenshift-fffb5e5e516d018a8d4bd063bc439a0a81447e31.tar.gz
openshift-fffb5e5e516d018a8d4bd063bc439a0a81447e31.tar.bz2
openshift-fffb5e5e516d018a8d4bd063bc439a0a81447e31.tar.xz
openshift-fffb5e5e516d018a8d4bd063bc439a0a81447e31.zip
Merge pull request #5929 from ingvagabund/remove-master-service-during-non-ha-to-ha-upgrade
Automatic merge from submit-queue. remove master.service during the non-ha to ha upgrade Bug: 1506165
Diffstat (limited to 'roles/docker/templates/systemcontainercustom.conf.j2')
0 files changed, 0 insertions, 0 deletions