Andreas Kruger bf29198efd Fix merge conflict		2018-03-29 09:11:13 +02:00
..
client	Support multiple artifacts under individual inventory directory	2018-03-08 11:57:53 +08:00
kubeadm	Refactored kubeadm join process and fixed uncrodonng for master nodes	2018-02-09 15:51:47 +01:00
master	Merge pull request #2504 from brtknr/patch-1	2018-03-22 09:15:55 +01:00
node	Merge pull request #2488 from LuckySB/ingress-nginx-node-role	2018-03-28 14:07:40 +02:00
preinstall	Merge pull request #2462 from woopstar/coredns-patch	2018-03-16 18:33:36 -05:00
secrets	Fix merge conflict	2018-03-29 09:11:13 +02:00