woopstar 004b0a3fcf Fix merge conflict		2018-03-30 11:38:59 +02:00
..
defaults	Addition of the .creds extension to the credentials files generated by password lookup in order for Ansible not to consider them as inventory files with inventory_ignore_extensions set accordingly (#2446)	2018-03-21 10:50:32 +03:00
handlers	Increased timeout values for k8s API server restart	2018-02-12 07:35:29 +00:00
tasks	Added retries in pre-upgrade.yml and retries while applying kube-dns.yml (#2553)	2018-03-29 11:37:32 -05:00
templates	Fix merge conflict	2018-03-30 11:38:59 +02:00
vars	Address standalone kubelet config case	2016-12-13 16:35:53 +01:00