Skip to content

Commit

Permalink
PR from HEAD of Magic Modules after long-running PR merged in. (#2246)
Browse files Browse the repository at this point in the history
  • Loading branch information
modular-magician authored and nat-henderson committed Oct 12, 2018
1 parent 00750ff commit a004e8f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion google/resource_compute_forwarding_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ See https://terraform.io/docs/providers/google/provider_versions.html for more d
Computed: true,
Deprecated: `This field is in beta and will be removed from this provider.
Use the terraform-provider-google-beta provider to continue using it.
See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`,
},
"service_name": {
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion google/resource_compute_global_address.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ See https://terraform.io/docs/providers/google/provider_versions.html for more d
Computed: true,
Deprecated: `This field is in beta and will be removed from this provider.
Use the terraform-provider-google-beta provider to continue using it.
See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`,
},
"project": {
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_forwarding_rule.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ In addition to the arguments listed above, the following computed attributes are
* `label_fingerprint` -
The fingerprint used for optimistic locking of this resource. Used
internally during updates. This property is in beta, and should be used with the terraform-provider-google-beta provider.
See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields.
See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields.

* `service_name` -
The internal fully qualified service name for this Forwarding Rule.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_global_address.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ In addition to the arguments listed above, the following computed attributes are
* `label_fingerprint` -
The fingerprint used for optimistic locking of this resource. Used
internally during updates. This property is in beta, and should be used with the terraform-provider-google-beta provider.
See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields.
See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields.
* `self_link` - The URI of the created resource.


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Represents an InterconnectAttachment (VLAN attachment) resource. For more
information, see Creating VLAN Attachments.



## Example Usage

```hcl
Expand Down

0 comments on commit a004e8f

Please sign in to comment.