12 Commits (922477f987cab8c33d934013ec3a88a351ea27a5)

Author	SHA1	Message	Date
k8s-merge-robot	5b21ae4ca7	Merge pull request #28814 from lixiaobing10051267/mastercidr ... Automatic merge from submit-queue Flannel doc description cidr modify File "docs\proposals\flannel-integration.md", line 123, "node controller backs off cidr allocation", here cidr is not easy to understand, can be modified to CIDR.	2016-07-21 16:35:48 -07:00
joe2far	88b6d4ad36	Fix broken warning image link in docs	2016-07-15 10:44:58 +01:00
joe2far	5ead89b5bb	Fixed several typos	2016-07-13 15:06:24 +01:00
lixiaobing10051267	0f5cbfb461	Flannel doc description cidr modify	2016-07-12 10:55:00 +08:00
David McMahon	2bff72b769	Updated docs and examples for release-1.3.	2016-06-13 12:24:34 -07:00
Dawn Chen	88de86fcb9	Revert "Versioning docs and examples for v1.4.0-alpha.0." ... This reverts commit cce9db3aa9.	2016-06-10 16:46:46 -07:00
David McMahon	cce9db3aa9	Versioning docs and examples for v1.4.0-alpha.0.	2016-06-10 14:55:35 -07:00
David McMahon	dae84f5306	Update the latestReleaseBranch to release-1.2 in the munger.	2016-03-08 18:59:28 -08:00
laushinka	7ef585be22	Spelling fixes inspired by github.com/client9/misspell	2016-02-18 06:58:05 +07:00
Chao Xu	2b2f285777	run hack/update-generated-docs.sh	2015-12-21 10:41:30 -08:00
Prashanth Balasubramanian	ad2d3d4c20	Docs etc	2015-11-25 09:42:59 +01:00
Prashanth Balasubramanian	321bc73264	Flannel server in static pod with private etcd.	2015-11-25 09:42:59 +01:00