shixiong/okd @ b29e9340544cbfb127e0a7f6be88f8b4f2818b4d

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