Skip to content

Commit

Permalink
providers/aws: aws_elb incr. idle_timeout to 60s
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoust committed Apr 23, 2015
1 parent 381a010 commit 6bb8947
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion builtin/providers/aws/resource_aws_elb.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/providers/aws/r/elb.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 6bb8947

Please sign in to comment.