From e28caa0496cac5a78e9bcc7421a4b09d185c5aac Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Wed, 13 Jul 2016 23:54:24 +0100 Subject: [PATCH 1/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b84939127..3caa03094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -203,6 +203,7 @@ BUG FIXES: * 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: `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/cloudstack: Fix using `cloudstack_network_acl` within a project [GH-6743] * provider/digitalocean: Stop `digitocean_droplet` forcing new resource on uppercase region [GH-7044] From 12dc87411ef39b3eb45549647561bcf85fe920a8 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Wed, 13 Jul 2016 16:59:50 -0600 Subject: [PATCH 2/2] docs: Improve the digitalocean_tag usage example (#7634) --- .../source/docs/providers/do/r/tag.html.markdown | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/do/r/tag.html.markdown b/website/source/docs/providers/do/r/tag.html.markdown index 562e400c6..02e0a9694 100644 --- a/website/source/docs/providers/do/r/tag.html.markdown +++ b/website/source/docs/providers/do/r/tag.html.markdown @@ -16,10 +16,19 @@ configuration via their ID or name. ## Example Usage ``` -# Create a new SSH key -resource "digitalocean_tag" "default" { +# Create a new tag +resource "digitalocean_tag" "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