diff options
| author | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-07-21 16:35:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 16:35:48 -0700 |
| commit | 374c20507f095ea270ec94b33080f477ff95b2a0 (patch) | |
| tree | 24daed117e9290573f0205740e5f56364f766421 /vendor/github.com | |
| parent | 2480fd47341d9c921c132ce05d79baed6dd24784 (diff) | |
| parent | 7f15526a26ee8d8d8cd044fd4aa40808494d9c79 (diff) | |
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.
Diffstat (limited to 'vendor/github.com')
0 files changed, 0 insertions, 0 deletions