Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(aws-ecs): Support HTTPS in load balanced Fargate service #1115

Merged
merged 7 commits into from
Nov 14, 2018
Merged

feat(aws-ecs): Support HTTPS in load balanced Fargate service #1115

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
486a577
feat(aws-ecs): Support HTTPS in load balanced Fargate service
clareliguori Nov 8, 2018
da61dca
Merge remote-tracking branch 'upstream/master' into tls-for-lb-fargat…
clareliguori Nov 12, 2018
cd2ecf4
Merge remote-tracking branch 'upstream/master' into tls-for-lb-fargat…
clareliguori Nov 12, 2018
caa3350
Merge remote-tracking branch 'upstream/master' into tls-for-lb-fargat…
clareliguori Nov 13, 2018
7c4c58e
fix merge typo
clareliguori Nov 13, 2018
dac7824
Remove ecs.DockerHub from newer tests
clareliguori Nov 13, 2018
855d8b4
Merge branch 'master' into tls-for-lb-fargate-svc
rix0rrr Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions packages/@aws-cdk/aws-ecs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,22 @@
"proxyquire": "^2.1.0"
},
"dependencies": {
"@aws-cdk/aws-applicationautoscaling": "^0.15.2",
"@aws-cdk/aws-autoscaling": "^0.15.2",
"@aws-cdk/aws-certificatemanager": "^0.15.2",
"@aws-cdk/aws-cloudformation": "^0.15.2",
"@aws-cdk/aws-cloudwatch": "^0.15.2",
"@aws-cdk/aws-ec2": "^0.15.2",
"@aws-cdk/aws-ecr": "^0.15.2",
"@aws-cdk/aws-elasticloadbalancing": "^0.15.2",
"@aws-cdk/aws-elasticloadbalancingv2": "^0.15.2",
"@aws-cdk/aws-iam": "^0.15.2",
"@aws-cdk/aws-lambda": "^0.15.2",
"@aws-cdk/aws-logs": "^0.15.2",
"@aws-cdk/aws-route53": "^0.15.2",
"@aws-cdk/cdk": "^0.15.2",
"@aws-cdk/cx-api": "^0.15.2"
"@aws-cdk/aws-applicationautoscaling": "^0.16.0",
"@aws-cdk/aws-autoscaling": "^0.16.0",
"@aws-cdk/aws-certificatemanager": "^0.16.0",
"@aws-cdk/aws-cloudformation": "^0.16.0",
"@aws-cdk/aws-cloudwatch": "^0.16.0",
"@aws-cdk/aws-ec2": "^0.16.0",
"@aws-cdk/aws-ecr": "^0.16.0",
"@aws-cdk/aws-elasticloadbalancing": "^0.16.0",
"@aws-cdk/aws-elasticloadbalancingv2": "^0.16.0",
"@aws-cdk/aws-iam": "^0.16.0",
"@aws-cdk/aws-lambda": "^0.16.0",
"@aws-cdk/aws-logs": "^0.16.0",
"@aws-cdk/aws-route53": "^0.16.0",
"@aws-cdk/cdk": "^0.16.0",
"@aws-cdk/cx-api": "^0.16.0"
>>>>>>> upstream/master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops

},
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
Expand All @@ -90,4 +91,4 @@
"@aws-cdk/aws-logs": "^0.16.0",
"@aws-cdk/cdk": "^0.16.0"
}
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.