github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11180 from mikedanese/footnote-fix

Browse Source 
fix merge conflict and footnote problem
This commit is contained in:
Dawn Chen 2015-07-13 14:24:09 -07:00
commit f635c9984c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/getting-started-guides/README.md
View File

@ -22,7 +22,7 @@ If you are considering contributing a new guide, please read the
IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level | Notes IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level | Notes
-------------------- | ------------ | ------ | ---------- | ------------------------------------------------------------------------------ | ----------- | ---------------------------- | ----- -------------------- | ------------ | ------ | ---------- | ------------------------------------------------------------------------------ | ----------- | ---------------------------- | -----
GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | [✓] [1] | Commercial | Uses K8s version 0.15.0 GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | [✓][<sup>1</sup>](#references) | Commercial | Uses K8s version 0.15.0
Vagrant | Saltstack | Fedora | OVS | [docs](../../docs/getting-started-guides/vagrant.md) | | Project | Uses latest via https://get.k8s.io/ Vagrant | Saltstack | Fedora | OVS | [docs](../../docs/getting-started-guides/vagrant.md) | | Project | Uses latest via https://get.k8s.io/
GCE | Saltstack | Debian | GCE | [docs](../../docs/getting-started-guides/gce.md) | | Project | Tested with 0.15.0 by @robertbailey GCE | Saltstack | Debian | GCE | [docs](../../docs/getting-started-guides/gce.md) | | Project | Tested with 0.15.0 by @robertbailey
Azure | CoreOS | CoreOS | Weave | [docs](../../docs/getting-started-guides/coreos/azure/README.md) | | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin)) | Uses K8s version 0.17.0 Azure | CoreOS | CoreOS | Weave | [docs](../../docs/getting-started-guides/coreos/azure/README.md) | | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin)) | Uses K8s version 0.17.0
@ -64,13 +64,8 @@ Definition of columns:
nodes. nodes.
- **Networking** is what implements the [networking model](../../docs/networking.md). Those with networking type - **Networking** is what implements the [networking model](../../docs/networking.md). Those with networking type
_none_ may not support more than one node, or may support multiple VM nodes only in the same physical node. _none_ may not support more than one node, or may support multiple VM nodes only in the same physical node.
<<<<<<< Updated upstream
- **Conformance** indicates whether a cluster created with this configuration has passed the project's conformance - **Conformance** indicates whether a cluster created with this configuration has passed the project's conformance
tests.
=======
- **Conforms** indicates whether a cluster created with this configuration has passed the project's conformance
tests for supporting the API and base features of Kubernetes v1.0.0. tests for supporting the API and base features of Kubernetes v1.0.0.
>>>>>>> Stashed changes
- Support Levels - Support Levels
- **Project**: Kubernetes Committers regularly use this configuration, so it usually works with the latest release - **Project**: Kubernetes Committers regularly use this configuration, so it usually works with the latest release
of Kubernetes. of Kubernetes.
@ -79,7 +74,7 @@ Definition of columns:
- **Inactive**: No active maintainer. Not recommended for first-time K8s users, and may be deleted soon. - **Inactive**: No active maintainer. Not recommended for first-time K8s users, and may be deleted soon.
- **Notes** is relevant information such as version k8s used. - **Notes** is relevant information such as version k8s used.
References: #### References:
- [1] [GCE conformance test result](https://gist.github.com/erictune/4cabc010906afbcc5061) - [1] [GCE conformance test result](https://gist.github.com/erictune/4cabc010906afbcc5061)
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/getting-started-guides/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/getting-started-guides/README.md?pixel)]()