7 Commits (8549c0bf60ce4f6eccae63c0667e382645196a54)

Author	SHA1	Message	Date
Brendan Burns	868aca04a0	Merge pull request #12687 from eparis/verfiy-dash ... Update flag-dash whitelist	2015-08-14 10:12:54 +08:00
Lei Zhang	6a2e58552d	vxlan as bankend of flannel & auto restart k8s.	2015-08-12 11:16:19 +08:00
He Simei	be26f1c5ab	fix unsupported param of containerized kubelet	2015-08-08 20:22:02 +08:00
He Simei	52ea1108eb	fix upstart param for containerized kebelet	2015-08-02 10:30:04 +08:00
Brendan Burns	b9a653bfbc	fix a missing 'g'	2015-07-29 13:22:47 -07:00
Harry Zhang	e6a2b068cb	Fix intend mess in scripts	2015-07-28 10:15:14 +08:00
Harry Zhang	611a41d894	Merge scripts of kube-in-docker with the manual guide	2015-07-28 10:15:14 +08:00