woopstar 004b0a3fcf Fix merge conflict		2018-03-30 11:38:59 +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	Fix merge conflict	2018-03-30 11:38:59 +02:00
node	Merge pull request #2290 from mirwan/node_labels_from_inventory	2018-03-30 03:42:52 -05:00
preinstall	Write cloud-config during kubelet configuration	2018-03-28 16:26:36 +03:00
secrets	Fix merge conflict	2018-03-29 09:11:13 +02:00