Merge pull request #306 from dlorenc/merge

Fix bad merge conflict.
2016-07-10 10:23:39 -07:00 · 2016-07-10 10:23:39 -07:00 · 6e9e757a61
parent b18739dc14 80ad525d39
commit 6e9e757a61
1 changed files with 1 additions and 0 deletions
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@ -31,6 +31,7 @@ import (
 )

 var (
+	addonManagerCmd = []string{"get", "pods", "--namespace=kube-system"}
 	dashboardRcCmd  = []string{"get", "rc", "kubernetes-dashboard", "--namespace=kube-system"}
 	dashboardSvcCmd = []string{"get", "svc", "kubernetes-dashboard", "--namespace=kube-system"}
 )