nhaveric 7c8be652e7 make-ssl: resolved merge conflict		2017-04-24 14:22:13 +02:00
..
master	kube-apiserver: add block for custom settings and option to remove insecure port	2017-04-24 14:22:13 +02:00
node	Two fixes to be able to deploy in our environment.	2017-04-24 14:22:13 +02:00
preinstall	fix stray 'in' and break into multiple lines for clarity	2017-04-20 09:53:01 -04:00
secrets	make-ssl: resolved merge conflict	2017-04-24 14:22:13 +02:00