Merge branch 'master' of github.com:hashicorp/terraform

CHANGELOG.md

@@ -2,8 +2,7 @@
 
 BACKWARDS INCOMPATIBILITIES / NOTES:
 
-* provider/aws: Users of aws_cloudfront_distributions with custom_origins have been broken due to changes in the AWS API requiring     
-  `OriginReadTimeout` being set for updates. This has been fixed and will show as a change in terraform plan / apply. [GH-13367]
+* provider/aws: Users of aws_cloudfront_distributions with custom_origins have been broken due to changes in the AWS API requiring   `OriginReadTimeout` being set for updates. This has been fixed and will show as a change in terraform plan / apply. [GH-13367]
 
 IMPROVEMENTS:
 

builtin/providers/opc/resource_ip_address_association.go

@@ -82,7 +82,7 @@ func resourceOPCIPAddressAssociationRead(d *schema.ResourceData, meta interface{
 	name := d.Id()
 
 	getInput := compute.GetIPAddressAssociationInput{
-		name,
+		Name: name,
 	}
 	result, err := client.GetIPAddressAssociation(&getInput)
 	if err != nil {