Merge branch 'master' into 4167-no-more-calico

2017-08-07 14:08:35 -07:00
parent 42a0fd25b1 68a3a7e074
commit b1ae7714a5
644 changed files with 10657 additions and 8757 deletions
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - caesarxuchao
 - erictune
 title: Setting up Kubernetes with Juju
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - thockin
 title: Manually Deploying Kubernetes on Ubuntu Nodes
 ---