Matthew Mosesohn 3cfb76e57f Merge pull request #1146 from mattymo/resolvconf_optimize ... Condense resolvconf sources before starting loop		2017-03-17 18:42:32 +03:00
..
master	Move calico-policy-controller into separate role	2017-03-17 11:21:52 +01:00
node	Explicitly set cni-bin-dir	2017-03-13 20:13:21 +03:00
preinstall	Condense resolvconf sources before starting loop	2017-03-17 13:06:56 +03:00
secrets	Merge branch 'master' into idempotency2	2017-03-16 09:29:43 +03:00