Antoine Legrand 859f6322a0 Merge branch 'master' into add_set_remote_user		2016-01-19 21:08:52 +01:00
..
apps	update kubedns submodule	2016-01-19 13:32:53 +01:00
dnsmasq	reduce dns timeout	2016-01-19 13:49:33 +01:00
docker	Flannel running as pod	2016-01-15 13:03:27 +01:00
download	upgrade kubernetes to 1.1.4 and calico to 0.14.0	2016-01-17 21:30:11 +01:00
etcd	Flannel running as pod	2016-01-15 13:03:27 +01:00
kubernetes	Merge branch 'master' into add_set_remote_user	2016-01-19 21:08:52 +01:00
network_plugin	Merge branch 'master' into add_set_remote_user	2016-01-19 21:08:52 +01:00