Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io: Add deprecation tag (#3922)
2017-05-26 17:00:22 -07:00
parent 0702830cde 4ca2f4e738
commit 726b147b72
4 changed files with 224 additions and 2 deletions
@@ -4,6 +4,8 @@ assignees:
 title: DCOS
 ---

+{% assign for_k8s_version="1.6" %}{% include feature-state-deprecated.md %}
+
 This guide will walk you through installing [Kubernetes-Mesos](https://github.com/mesosphere/kubernetes-mesos) on [Datacenter Operating System (DCOS)](https://mesosphere.com/product/) with the [DCOS CLI](https://github.com/mesosphere/dcos-cli) and operating Kubernetes with the [DCOS Kubectl plugin](https://github.com/mesosphere/dcos-kubectl).

 * TOC