shixiong/okd @ 07113bc31ffa60a5fc3f34b392576d4639474485

Tim Bielawa 70a68bc2f9 Merge pull request #2615 from tbielawa/node-labels-fix		8 anni fa
..
oo_filters.py	d0bc360275 Add node-labels to kubeletArguments	8 anni fa
oo_zabbix_filters.py	d1d0bb94e2 adding itservice	9 anni fa
openshift_master.py	5bfa7e8da7 Fix typos	8 anni fa
openshift_node.py	4d4793233e Fix configuration of dns_ip	9 anni fa