Merge branch 'master' into inline-titles

2016-12-19 18:46:34 -05:00
parent d8d99a171e 16d844bd5f
commit 5bab707a82
21 changed files with 289 additions and 729 deletions
@@ -13,6 +13,12 @@ title: Tools

 [`kubectl`](/docs/user-guide/kubectl/) is the command line tool for Kubernetes. It controls the Kubernetes cluster manager.

+### Kubefed
+
+[`kubefed`](/docs/admin/federation/kubefed/) is the command line tool
+to help you administrate your federated clusters.
+
+
 ### Dashboard 

 [Dashboard](/docs/user-guide/ui/), the web-based user interface of Kubernetes, allows you to deploy containerized applications