shixiong/okd @ 6b0e66f285ffa9ed633db4a4eed1974d90128b64

Devan Goodwin 03f31fdc58 Merge remote-tracking branch 'upstream/master' into upgrade33		пре 9 година
..
oo_filters.py	03f31fdc58 Merge remote-tracking branch 'upstream/master' into upgrade33	пре 9 година
oo_zabbix_filters.py	d1d0bb94e2 adding itservice	пре 9 година
openshift_master.py	5701ba78c6 Ansible 2.1 support.	пре 9 година
openshift_node.py	4d4793233e Fix configuration of dns_ip	пре 9 година