whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into improve_centos_guide

Browse Source
This commit is contained in:
David Newswanger
2016-11-08 15:02:06 -05:00
committed by GitHub
parent fe8d92d27a cfe0f0e22a
commit 8c15032cc1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contribute/create-pull-request.md
+2 -2
View File
@@ -44,7 +44,7 @@ choose the
[page type](/docs/contribute/page-templates/) [page type](/docs/contribute/page-templates/)
that is the best fit for your content. that is the best fit for your content.
### Submitting a pull request to the master branch ### Submitting a pull request to the master branch (Current Release)
If you want your change to be published in the released version Kubernetes docs, If you want your change to be published in the released version Kubernetes docs,
create a pull request against the master branch of the Kubernetes create a pull request against the master branch of the Kubernetes
@@ -62,7 +62,7 @@ site where you can verify that your changes have rendered correctly.
If needed, revise your pull request by committing changes to your If needed, revise your pull request by committing changes to your
new branch in your fork. new branch in your fork.
### Submitting a pull request to the <vnext> branch ### Submitting a pull request to the <vnext> branch (Upcoming Release)
If your documentation change should not be released until the next release of If your documentation change should not be released until the next release of
the Kubernetes product, create a pull request against the <vnext> branch the Kubernetes product, create a pull request against the <vnext> branch
docs/getting-started-guides/scratch.md
+1 -1
View File
@@ -381,7 +381,7 @@ The minimum version required is [v0.5.6](https://github.com/coreos/rkt/releases/
minimum version required to match rkt v0.5.6 is minimum version required to match rkt v0.5.6 is
[systemd 215](http://lists.freedesktop.org/archives/systemd-devel/2014-July/020903.html). [systemd 215](http://lists.freedesktop.org/archives/systemd-devel/2014-July/020903.html).
[rkt metadata service](https://github.com/coreos/rkt/blob/master/Documentation/networking.md) is also required [rkt metadata service](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md) is also required
for rkt networking support. You can start rkt metadata service by using command like for rkt networking support. You can start rkt metadata service by using command like
`sudo systemd-run rkt metadata-service` `sudo systemd-run rkt metadata-service`