Merge pull request #36336 from justinsb/federation_dns_hosted_zone_2

Automatic merge from submit-queue Federation: allow specification of dns zone by ID
2016-11-17 00:49:09 -08:00
parent 68539c02c1 df4280651c
commit 47a431e82f
5 changed files with 60 additions and 13 deletions
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -595,6 +595,7 @@ watch-only
 whitelist-override-label
 windows-line-endings
 www-prefix
+zone-id
 zone-name
 garbage-collector-enabled
 viper-config