From 38573b8fedc82b2fef8f95bfbd018904782f4aaf Mon Sep 17 00:00:00 2001 From: Lee Calcote Date: Sun, 16 Oct 2016 21:00:05 -0500 Subject: [PATCH 1/2] Update kubernetes.html.md Included Kubernetes contributors and rkt compatibility. --- website/source/intro/vs/kubernetes.html.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/website/source/intro/vs/kubernetes.html.md b/website/source/intro/vs/kubernetes.html.md index fa688f4e3..022b0b973 100644 --- a/website/source/intro/vs/kubernetes.html.md +++ b/website/source/intro/vs/kubernetes.html.md @@ -8,9 +8,8 @@ description: |- # Nomad vs. Kubernetes -Kubernetes is an orchestration system for Docker developed by the Cloud Native -Computing Foundation (CNCF). Kubernetes aims to provide all the features -needed to run Docker based applications including cluster management, +Kubernetes is an orchestration system for containers originally designed by Google, now governed by the Cloud Native +Computing Foundation (CNCF) and devloped by Google, Red Hat, CoreOS and many others. Kubernetes aims to provide all the features needed to run docker or rkt-based applications including cluster management, scheduling, service discovery, monitoring, secrets management and more. Nomad only aims to provide cluster management and scheduling and is designed From abcedc464ef0e097f92141489ce70d91936f4bd1 Mon Sep 17 00:00:00 2001 From: Lee Calcote Date: Thu, 20 Oct 2016 08:25:23 -0500 Subject: [PATCH 2/2] Capitalized Docker and Rkt. Corrected typo. --- website/source/intro/vs/kubernetes.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/intro/vs/kubernetes.html.md b/website/source/intro/vs/kubernetes.html.md index 022b0b973..94c50ca90 100644 --- a/website/source/intro/vs/kubernetes.html.md +++ b/website/source/intro/vs/kubernetes.html.md @@ -9,7 +9,7 @@ description: |- # Nomad vs. Kubernetes Kubernetes is an orchestration system for containers originally designed by Google, now governed by the Cloud Native -Computing Foundation (CNCF) and devloped by Google, Red Hat, CoreOS and many others. Kubernetes aims to provide all the features needed to run docker or rkt-based applications including cluster management, +Computing Foundation (CNCF) and developed by Google, Red Hat, CoreOS and many others. Kubernetes aims to provide all the features needed to run Docker or Rkt-based applications including cluster management, scheduling, service discovery, monitoring, secrets management and more. Nomad only aims to provide cluster management and scheduling and is designed