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

This commit is contained in:
stack72 2017-04-27 05:45:17 +12:00
commit f094dda901
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
2 changed files with 2 additions and 3 deletions

View File

@ -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:

View File

@ -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 {