Merge branch 'master' into release-1.8

2017-09-14 10:14:57 -07:00
parent 90d95e7ab2 6da3922bb5
commit ed363f786c
76 changed files with 2168 additions and 930 deletions
@@ -851,4 +851,8 @@ several media types.

 {% endcapture %}

+{% capture whatsnext %}
+* Follow an example of [deploying WordPress and MySQL with Persistent Volumes](/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/).
+{% endcapture %}
+
 {% include templates/concept.md %}