Merge branch 'release-1.5' of github.com:kubernetes/kubernetes.github.io into ss-basics

2016-12-02 09:57:38 -08:00
parent bef91e9b26 3777dde47f
commit 1ce5dc5cce
12 changed files with 507 additions and 37 deletions
@@ -31,4 +31,9 @@ toc:
  section:
  - title: Assigning Pods to Nodes
    path: /docs/tasks/administer-cluster/assign-pods-nodes/
-
+  - title: Autoscaling the DNS Service in a Cluster
+    path: /docs/tasks/administer-cluster/dns-horizontal-autoscaling/
+- title: Managing Stateful Applications
+  section:
+  - title: Upgrading from PetSets to StatefulSets
+    path: /docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/