Brandon Tosch 193c25788d Merge branch 'master' into brandontosch/GH-11874 ... # Conflicts: # vendor/vendor.json		2017-03-05 18:03:40 -08:00
..
cdn	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
compute	[WIP] arm/disk implementation	2017-03-03 14:31:40 -08:00
containerregistry	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
containerservice	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
disk	[WIP] arm/disk implementation	2017-03-03 14:31:40 -08:00
eventhub	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
keyvault	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
network	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
redis	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
resources/resources	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
scheduler	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
servicebus	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
storage	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00
trafficmanager	provider/azurerm: update SDK to v8.1.0-beta (#12362)	2017-03-03 20:48:10 +02:00