Merged master into release-1.10 and resolved merge conflicts.

This commit is contained in:
Andrew Chen
2018-03-13 16:36:07 -07:00
18 changed files with 183 additions and 258 deletions
@@ -341,7 +341,7 @@ Output:
- ingress: disabled
```
Minikube must be running for these command to take effect. To enable `heapster` addon, for example:
Minikube must be running for these commands to take effect. To enable `heapster` addon, for example:
```shell
minikube addons enable heapster