Merge remote-tracking branch 'upstream/release-1.5' into release-1.5

This commit is contained in:
Devin Donnelly 2016-12-07 17:58:08 -08:00
commit 6f88ea213f
2 changed files with 7 additions and 5 deletions

View File

@ -53,9 +53,9 @@ toc:
path: /docs/tutorials/stateless-application/expose-external-ip-address/
- title: Stateful Applications
section:
- title: StatefulSet Basics
path: /docs/tutorials/stateful-application/basic-stateful-set/
- title: Running a Single-Instance Stateful Application
path: /docs/tutorials/stateful-application/run-stateful-application/
- title: Running a Replicated Stateful Application
path: /docs/tutorials/stateful-application/run-replicated-stateful-application/
- title: StatefulSet Basics
path: /docs/tutorials/stateful-application/basic-stateful-set/
path: /docs/tutorials/stateful-application/run-replicated-stateful-application/

View File

@ -20,10 +20,12 @@ each of which has a sequence of steps.
#### Stateful Applications
* [Running a Single-Instance Stateful Application](/docs/tutorials/stateful-application/run-stateful-application/)
* [Running a Replicated Stateful Application](/docs/tutorials/stateful-application/run-replicated-stateful-application/)
* [StatefulSet Basics](/docs/tutorials/stateful-application/basic-stateful-set/)
* [Running a Single-Instance Stateful Application](/docs/tutorials/stateful-application/run-stateful-application/)
* [Running a Replicated Stateful Application](/docs/tutorials/stateful-application/run-replicated-stateful-application/)
### What's next
If you would like to write a tutorial, see