shixiong/okd @ c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0

OpenShift Bot 60360f5e60 Merge pull request #4894 from tbielawa/reg-dns-scaleup-bz1469336		il y a 7 ans
..
files	c37fbea2f7 Fix templating of static service files	il y a 8 ans
main.yml	fbb5f4c002 Tolerate non existence of /etc/sysconfig/atomic-openshift-master	il y a 7 ans
set_loopback_context.yml	81345f2ee5 conditionalize loopback config on v >= 3.2/1.2	il y a 9 ans
system_container.yml	2c7a684909 Use meta/main.yml for role dependencies	il y a 8 ans
systemd_units.yml	88c946de1c Use existing OPENSHIFT_DEFAULT_REGISTRY setting during masters scaleup	il y a 7 ans