shixiong/okd @ ba525e1ebfe44b1993f0b37801122c4030e72d48

Devan Goodwin 00eb0c79ed Merge remote-tracking branch 'upstream/master' into upgrade33		il y a 8 ans
..
oo_filters.py	bab4a4b6ae Fix image tag to rpm version filter.	il y a 9 ans
oo_zabbix_filters.py	d1d0bb94e2 adding itservice	il y a 9 ans
openshift_master.py	5701ba78c6 Ansible 2.1 support.	il y a 8 ans
openshift_node.py	4d4793233e Fix configuration of dns_ip	il y a 9 ans