shixiong/okd @ ddaae1b4d3311e89caaa4cee348d45dfb15eeaa6

David Critch 423bbf268a Merge branch 'master' into openstack-ssl-cert		пре 6 година
..
azure.conf.j2	26f3988980 Create cloud config when using azure provider	пре 7 година
openstack.conf.j2	3c69dc4e58 Adding support for an SSL certificate signed by the OpenStack cluster	пре 7 година
vsphere.conf.j2	805c4a3d5b add template and vsphere.conf	пре 7 година