Skip to content

Commit 1fbf156

Browse files
bryantbiggsbryantbiggs
committed
chore: Fix merge conflicts
1 parent c5c37bb commit 1fbf156

File tree

11 files changed

+6
-83
lines changed

11 files changed

+6
-83
lines changed

‎examples/complete/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,13 @@ Note that this example may create resources which will incur monetary charges on
2727
| Name | Version |
2828
|------|---------|
2929
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
30-
<<<<<<< HEAD
31-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.34 |
32-
=======
3330
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
34-
>>>>>>> 4930195 (chore: Update required min versions)
3531

3632
## Providers
3733

3834
| Name | Version |
3935
|------|---------|
40-
<<<<<<< HEAD
41-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.34 |
42-
=======
4336
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
44-
>>>>>>> 4930195 (chore: Update required min versions)
4537

4638
## Modules
4739

‎examples/complete/main.tf‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,16 @@ module "ecs" {
113113
port = local.container_port
114114
dns_name = local.container_name
115115
}
116+
117+
timeout = {
118+
idle_timeout_seconds = 20
119+
per_request_timeout_seconds = 30
120+
}
121+
116122
port_name = local.container_name
117123
discovery_name = local.container_name
118124
}
119125
]
120-
timeout = {
121-
idle_timeout_seconds = 20
122-
per_request_timeout_seconds = 30
123-
}
124-
port_name = local.container_name
125-
discovery_name = local.container_name
126-
}
127126
}
128127

129128
load_balancer = {

‎examples/ec2-autoscaling/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,13 @@ Note that this example may create resources which will incur monetary charges on
2727
| Name | Version |
2828
|------|---------|
2929
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
30-
<<<<<<< HEAD
31-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.34 |
32-
=======
3330
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
34-
>>>>>>> 4930195 (chore: Update required min versions)
3531

3632
## Providers
3733

3834
| Name | Version |
3935
|------|---------|
40-
<<<<<<< HEAD
41-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.34 |
42-
=======
4336
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
44-
>>>>>>> 4930195 (chore: Update required min versions)
4537

4638
## Modules
4739

‎examples/fargate/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,13 @@ Note that this example may create resources which will incur monetary charges on
2727
| Name | Version |
2828
|------|---------|
2929
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
30-
<<<<<<< HEAD
31-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.34 |
32-
=======
3330
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
34-
>>>>>>> 4930195 (chore: Update required min versions)
3531

3632
## Providers
3733

3834
| Name | Version |
3935
|------|---------|
40-
<<<<<<< HEAD
41-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.34 |
42-
=======
4336
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
44-
>>>>>>> 4930195 (chore: Update required min versions)
4537

4638
## Modules
4739

‎modules/cluster/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,13 @@ module "ecs_cluster" {
137137
| Name | Version |
138138
|------|---------|
139139
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
140-
<<<<<<< HEAD
141-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.34 |
142-
=======
143140
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
144-
>>>>>>> 4930195 (chore: Update required min versions)
145141

146142
## Providers
147143

148144
| Name | Version |
149145
|------|---------|
150-
<<<<<<< HEAD
151-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.34 |
152-
=======
153146
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
154-
>>>>>>> 4930195 (chore: Update required min versions)
155147

156148
## Modules
157149

‎modules/container-definition/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,21 +116,13 @@ module "example_ecs_container_definition" {
116116
| Name | Version |
117117
|------|---------|
118118
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
119-
<<<<<<< HEAD
120-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.34 |
121-
=======
122119
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
123-
>>>>>>> 4930195 (chore: Update required min versions)
124120

125121
## Providers
126122

127123
| Name | Version |
128124
|------|---------|
129-
<<<<<<< HEAD
130-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.34 |
131-
=======
132125
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
133-
>>>>>>> 4930195 (chore: Update required min versions)
134126

135127
## Modules
136128

‎modules/container-definition/versions.tf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
<<<<<<< HEAD
8-
version = ">= 5.34"
9-
=======
107
version = ">= 5.37"
11-
>>>>>>> 4930195 (chore: Update required min versions)
128
}
139
}
1410
}

‎modules/service/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,21 +167,13 @@ module "ecs_service" {
167167
| Name | Version |
168168
|------|---------|
169169
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
170-
<<<<<<< HEAD
171-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.34 |
172-
=======
173170
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
174-
>>>>>>> 4930195 (chore: Update required min versions)
175171

176172
## Providers
177173

178174
| Name | Version |
179175
|------|---------|
180-
<<<<<<< HEAD
181-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.34 |
182-
=======
183176
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
184-
>>>>>>> 4930195 (chore: Update required min versions)
185177

186178
## Modules
187179

‎modules/service/versions.tf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
<<<<<<< HEAD
8-
version = ">= 5.34"
9-
=======
107
version = ">= 5.37"
11-
>>>>>>> 4930195 (chore: Update required min versions)
128
}
139
}
1410
}

‎wrappers/container-definition/versions.tf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
<<<<<<< HEAD
8-
version = ">= 5.34"
9-
=======
107
version = ">= 5.37"
11-
>>>>>>> 4930195 (chore: Update required min versions)
128
}
139
}
1410
}

0 commit comments

Comments
 (0)