Skip to content

merge master into develop #1521

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

Merged
merged 9 commits into from
Mar 17, 2020
Merged

merge master into develop #1521

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dfe1229
docs: update 2016-10-31.md (#1473)
waderobson Feb 28, 2020
8650fcb
chore: bump translator version (#1483)
Mar 3, 2020
e2a6dbd
chore: merge pull request #1485 from awslabs/develop
Mar 3, 2020
b741040
chore: merge pull request #1495 from awslabs/develop
Mar 6, 2020
dd1c3d3
chore: merge develop into release/v1.22.0 (#1505)
Mar 11, 2020
7dc8a20
feat: add payloadformatversion to httpapi events (#1517)
Mar 16, 2020
19ed4a0
chore: merge pull request #1520
Mar 16, 2020
a12feb6
merge pull request #1519 from awslabs/release/v1.22.0
Mar 16, 2020
0ba2561
Merge branch 'master' of github.com:awslabs/serverless-application-mo…
Mar 16, 2020
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
2 changes: 1 addition & 1 deletion versions/2016-10-31.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ Enable custom domains to be configured with your Api. Currently only supports Cr
```yaml
Domain:
DomainName: String # REQUIRED | custom domain name being configured on the api, "www.example.com"
CertificateARN: String # REQUIRED | Must be a valid [certificate ARN](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html), and for EDGE endpoint configuration the certificate must be in us-east-1
CertificateArn: String # REQUIRED | Must be a valid [certificate ARN](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html), and for EDGE endpoint configuration the certificate must be in us-east-1
EndpointConfiguration: "EDGE" # optional | Default value is REGIONAL | Accepted values are EDGE | REGIONAL
BasePath:
- String # optional | Default value is '/' | List of basepaths to be configured with the ApiGateway Domain Name
Expand Down