Merge pull request #1646 from pmoust/elb-default-idle-timeout

providers/aws: aws_elb incr. idle_timeout to 60s
hashicorp · Apr 23, 2015 · a4cfa2e · a4cfa2e
2 parents 381a010 + 6bb8947
commit a4cfa2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/builtin/providers/aws/resource_aws_elb.go b/builtin/providers/aws/resource_aws_elb.go
@@ -84,7 +84,7 @@ func resourceAwsElb() *schema.Resource {
  "idle_timeout": &schema.Schema{
  Type: schema.TypeInt,
  Optional: true,
- Default: 30,
+ Default: 60,
  },
 
  "connection_draining": &schema.Schema{

diff --git a/website/source/docs/providers/aws/r/elb.html.markdown b/website/source/docs/providers/aws/r/elb.html.markdown
@@ -62,7 +62,7 @@ The following arguments are supported:
 * `listener` - (Required) A list of listener blocks. Listeners documented below.
 * `health_check` - (Optional) A health_check block. Health Check documented below.
 * `cross_zone_load_balancing` - (Optional) Enable cross-zone load balancing.
-* `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: 300.
+* `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: 60.
 * `connection_draining` - (Optional) Boolean to enable connection draining.
 * `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain.