Merge branch 'develop' of https://github.com/Azure/AzureStack-QuickStart-Templates into tp2

Dipak V · Dipak V · commit b5a72e88f364 · 2016-09-16T12:58:21.000-07:00
diff --git a/ad-non-ha/vnet-with-dns-server.json b/ad-non-ha/vnet-with-dns-server.json
@@ -42,7 +42,7 @@
                     ]
                 },
                 "dhcpOptions": {
-                    "dnsServers": [ "[parameters('DNSServerAddress')]" ]
+                    "dnsServers": "[parameters('DNSServerAddress')]"
                 },
                 "subnets": "[parameters('subnets')]"
             }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`]`
`43`	`43`	`},`
`44`	`44`	`"dhcpOptions": {`
`45`		`- "dnsServers": [ "[parameters('DNSServerAddress')]" ]`
	`45`	`+ "dnsServers": "[parameters('DNSServerAddress')]"`
`46`	`46`	`},`
`47`	`47`	`"subnets": "[parameters('subnets')]"`
`48`	`48`	`}`