Antoine Legrand 26e3142c95 Merge branch 'master' into standalone_kubelet		2016-12-13 17:26:21 +01:00
..
azurerm	Add Azure Resource Manager templates to contrib folder	2016-12-13 15:37:04 +01:00
network-storage/glusterfs	Address standalone kubelet config case	2016-12-13 16:35:53 +01:00
terraform	Delete .tfstate and .tfstate.backup from openstack terraform	2016-12-13 15:37:04 +01:00