5 commits

Author	SHA1	Message	Date
Anton Nerozya	e1992caa8a	Merged with upstream master	2017-07-25 16:46:17 +02:00
Abdelsalam Abbas	ecaa7dad49	add a variable for kube_apiserver at all	2017-07-10 20:16:02 +02:00
Abdelsalam Abbas	22d600e8c0	fix azure kubernetes port to 6443	2017-07-09 09:56:32 +02:00
Anton Nerozya	e41e67ea1d	typo fix	2017-06-24 11:35:08 +02:00
Alexander Block	c87f4f613e	Add Azure Resource Manager templates to contrib folder	2016-12-13 15:37:04 +01:00