Merge pull request hashicorp#4467 from hashicorp/b-azure-upstream

jen20 · jen20 · commit a86210b50bb2 · 2015-12-30T14:19:56.000-05:00
provider/azure: Track upstream library changes
diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go
@@ -695,7 +695,7 @@ func retrieveVMImageDetails(
 			}
 
 			configureForImage := func(role *virtualmachine.Role) error {
-				return vmutils.ConfigureDeploymentFromVMImage(
+				return vmutils.ConfigureDeploymentFromPublishedVMImage(
 					role,
 					img.Name,
 					"",

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ func retrieveVMImageDetails(`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`configureForImage := func(role *virtualmachine.Role) error {`
`698`		`- return vmutils.ConfigureDeploymentFromVMImage(`
	`698`	`+ return vmutils.ConfigureDeploymentFromPublishedVMImage(`
`699`	`699`	`role,`
`700`	`700`	`img.Name,`
`701`	`701`	`"",`