From e3c7ccb1d77f2dbb71dd7181d1f55159c344c866 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 30 Sep 2014 13:30:15 -0700 Subject: [PATCH] Update changelog --- CHANGELOG.md | 1 + website/source/docs/providers/aws/r/elb.html.markdown | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75ec2ceed..048297476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ BUG FIXES: * core: Plugin loading from CWD works properly. * providers/aws: autoscaling_group can be launched into a vpc [GH-259] * providers/aws: not an error when RDS instance is deleted manually. [GH-307] + * providers/aws: add `internal` option for ELBs. [GH-303] ## 0.2.2 (September 9, 2014) diff --git a/website/source/docs/providers/aws/r/elb.html.markdown b/website/source/docs/providers/aws/r/elb.html.markdown index 863cb916a..e919bdab9 100644 --- a/website/source/docs/providers/aws/r/elb.html.markdown +++ b/website/source/docs/providers/aws/r/elb.html.markdown @@ -44,6 +44,7 @@ The following arguments are supported: * `security_groups` - (Optional) A list of security group IDs to assign to the ELB. * `subnets` - (Optional) A list of subnets to attach to the ELB. * `instances` - (Optional) A list of instance ids to place in the ELB pool. +* `internal` - (Optional) If true, ELB will be an internal ELB. * `listener` - (Required) A list of listener blocks. Listeners documented below. * `health_check` - (Optional) A health_check block. Health Check documented below.