Matthew Mosesohn fe16fecd8f Fix canal's calico networking config for ETCD TLS ...

Also fixes kube-apiserver upgrade that was erroneously
deleted in a previous commit.

2016-11-10 12:49:47 +03:00

..

master

Fix canal's calico networking config for ETCD TLS

2016-11-10 12:49:47 +03:00

node

Merge pull request #591 from kubernetes-incubator/etcdtls

2016-11-10 12:32:13 +03:00

preinstall

Merge pull request #591 from kubernetes-incubator/etcdtls

2016-11-10 12:32:13 +03:00

secrets

Merge pull request #561 from kubespray/rsync_certs

2016-10-27 10:52:41 +02:00