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

..

api-group.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

apiserver-watch.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

client-package-structure.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

cluster-deployment.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

container-init.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

container-runtime-interface-v1.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

controller-ref.md

Fix broken verify-munge-docs build by running hack/update-munge-docs.sh.

2016-07-20 18:58:55 -07:00

custom-metrics.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

deploy.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

deployment.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

disk-accounting.md

Merge pull request #26702 from joe2far/fix-broken-links

2016-07-20 15:10:41 -07:00

federated-api-servers.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

federation-high-level-arch.png

Cluster Federation RFC.

2015-04-14 15:57:33 -07:00

federation-lite.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

federation.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

flannel-integration.md

Merge pull request #28814 from lixiaobing10051267/mastercidr

2016-07-21 16:35:48 -07:00

garbage-collection.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

gpu-support.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

high-availability.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

initial-resources.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

job.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

kubelet-eviction.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

kubelet-systemd.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

kubelet-tls-bootstrap.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

Kubemark_architecture.png

Initial kubemark proposal

2015-09-10 09:54:42 +02:00

kubemark.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

local-cluster-ux.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

metrics-plumbing.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

multiple-schedulers.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

network-policy.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

node-allocatable.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

node-allocatable.png

Node Allocatable resources proposal

2015-12-07 16:43:15 -08:00

performance-related-monitoring.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

pleg.png

Proposal: add pod lifecycle event generator for kubelet

2016-01-12 10:16:39 -08:00

pod-cache.png

Proposal: add a runtime pod cache in kubelet

2016-02-04 11:23:38 -08:00

pod-lifecycle-event-generator.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

pod-security-context.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

protobuf.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

release-notes.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

rescheduler.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

rescheduling.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

resource-metrics-api.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

resource-quota-scoping.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

runtime-client-server.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

runtime-pod-cache.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

scalability-testing.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

scheduledjob.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

secret-configmap-downwarapi-file-mode.md

Fix broken verify-munge-docs build by running hack/update-munge-docs.sh.

2016-07-20 18:58:55 -07:00

security-context-constraints.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

self-hosted-kubelet.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

selinux.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

service-discovery.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

service-external-name.md

Fix broken verify-munge-docs build by running hack/update-munge-docs.sh.

2016-07-20 18:58:55 -07:00

templates.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

volume-ownership-management.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

volume-provisioning.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

volume-selectors.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00

volumes.md

Fix broken warning image link in docs

2016-07-15 10:44:58 +01:00