ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
stack72 2016-07-14 08:33:39 +01:00
parent c141050929 12dc87411e
commit 18f04c58b8
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -203,6 +203,7 @@ BUG FIXES:
* provider/azurerm: `azurerm_dns_cname_record` can create CNAME records again [GH-7113] * provider/azurerm: `azurerm_dns_cname_record` can create CNAME records again [GH-7113]
* provider/azurerm: `azurerm_network_security_group` now waits for the provisioning state of `ready` before proceeding [GH-7307] * provider/azurerm: `azurerm_network_security_group` now waits for the provisioning state of `ready` before proceeding [GH-7307]
* provider/azurerm: `computer_name` is now required for `azurerm_virtual_machine` resources [GH-7308] * provider/azurerm: `computer_name` is now required for `azurerm_virtual_machine` resources [GH-7308]
* provider/azurerm: destroy azurerm_virtual_machine OS Disk VHD on deletion [GH-7584]
* provider/cloudflare: Fix issue upgrading CloudFlare Records created before v0.6.15 [GH-6969] * provider/cloudflare: Fix issue upgrading CloudFlare Records created before v0.6.15 [GH-6969]
* provider/cloudstack: Fix using `cloudstack_network_acl` within a project [GH-6743] * provider/cloudstack: Fix using `cloudstack_network_acl` within a project [GH-6743]
* provider/digitalocean: Stop `digitocean_droplet` forcing new resource on uppercase region [GH-7044] * provider/digitalocean: Stop `digitocean_droplet` forcing new resource on uppercase region [GH-7044]

13
website/source/docs/providers/do/r/tag.html.markdown
View File

@ -16,10 +16,19 @@ configuration via their ID or name.
## Example Usage ## Example Usage
``` ```
# Create a new SSH key # Create a new tag
resource "digitalocean_tag" "default" { resource "digitalocean_tag" "foobar" {
name = "foobar" name = "foobar"
} }
# Create a new droplet in nyc3 with the foobar tag
resource "digitalocean_droplet" "web" {
image = "ubuntu-16-04-x64"
name = "web-1"
region = "nyc3"
size = "512mb"
tags = ["${digitalocean_tag.foobar.id}"]
}
``` ```
## Argument Reference ## Argument Reference