Merge pull request #12872 from runningwild/master

Fix several problems with using rkt on gce
2015-08-20 15:46:16 -07:00
parent 90bc5565be 80e799fc0c
commit 9b01580946
8 changed files with 55 additions and 37 deletions
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -198,6 +198,7 @@ required-contexts
 resource-container
 resource-quota-sync-period
 resource-version
+rkt-path
 root-ca-file
 root-dir
 run-proxy