shixiong/okd @ 1ae447a3409afe4308e61f2511ab6dc1a9ca92cb

Andrew Butcher 9180998225 Merge pull request #2511 from vishpat/nuage_ha		8 gadi atpakaļ
..
oo_filters.py	9180998225 Merge pull request #2511 from vishpat/nuage_ha	8 gadi atpakaļ
oo_zabbix_filters.py	d1d0bb94e2 adding itservice	9 gadi atpakaļ
openshift_master.py	05047e0e60 enable service-serving-cert-signer by default	8 gadi atpakaļ
openshift_node.py	4d4793233e Fix configuration of dns_ip	9 gadi atpakaļ