Code

Fix conflicts release 1 30#1804

Code

Merged

qingchm merged 19 commits intoaws:release/v1.30.0aws/serverless-application-model:release/v1.30.0from mndeveci:fix_conflicts_release_1_30mndeveci/serverless-application-model:fix_conflicts_release_1_30Copy head branch name to clipboardNov 18, 2020

Commits

Commits on Aug 11, 2020

• Release v1.26.0 (aws#1680)

  Show description for c96cda1
  

  6 peopleauthored
  c96cda1

  Copy full SHA for c96cda1

Commits on Sep 5, 2020

• Update __init__.py (aws#1704)

  mndeveci

  authored
  a081602

  Copy full SHA for a081602

Commits on Sep 18, 2020

• Release/v1.27.0 resolveconflict (aws#1717)

  Show description for 2ef7591
  

  8 peopleauthored
  2ef7591

  Copy full SHA for 2ef7591

• Merge remote-tracking branch 'origin/master' into release/v1.27.0

  wchengru

  committed
  847cf92

  Copy full SHA for 847cf92

• Merge branch 'release/v1.27.0'

  wchengru

  committed
  68596b6

  Copy full SHA for 68596b6

Commits on Oct 27, 2020

• Release/v1.28.0 (aws#1754) (aws#1756)

  Show description for a5595d6
  

  wchengru

  and

  Tolledo

  authored
  a5595d6

  Copy full SHA for a5595d6

Commits on Oct 28, 2020

• bump version to 1.28.1 (aws#1758) (aws#1759)

  wchengru

  authored
  df07ee4

  Copy full SHA for df07ee4

Commits on Nov 5, 2020

• Fix merge conflict in release 1.29.0 (aws#1771)

  Show description for 815b6aa
  

  13 peopleauthored
  815b6aa

  Copy full SHA for 815b6aa

Commits on Nov 17, 2020

• fix: Validate API request models (aws#1757)

  

  prenx4x

  authored and

  mndeveci

  committed
  d4d1b13

  Copy full SHA for d4d1b13

• chore: Upgrade outdated dependencies in base.txt and dev.txt (aws#1744)

  Show description for 966785b
  

  aahung

  authored and

  mndeveci

  committed
  966785b

  Copy full SHA for 966785b

• chore: Use Compatible release clause in requirement files (aws#1762)

  

  aahung

  authored and

  mndeveci

  committed
  b30f2e6

  Copy full SHA for b30f2e6

• Fix: SAM Crashes Invalid swagger models exception (aws#1765)

  Show description for cacd53b
  

  2 peopleauthored and

  mndeveci

  committed
  cacd53b

  Copy full SHA for cacd53b

• Fix: DefaultAuth not a string exception (aws#1774)

  Show description for 586c0cf
  

  2 peopleauthored and

  mndeveci

  committed
  586c0cf

  Copy full SHA for 586c0cf

• Adding PermissionsBoundary property for State Machine resource (aws#1772)

  Show description for 6c5e933
  

  2 peopleauthored and

  mndeveci

  committed
  6c5e933

  Copy full SHA for 6c5e933

• fix: use newer policy name in gov & cn regions for xray (aws#1767)

  mndeveci

  committed
  06f5efb

  Copy full SHA for 06f5efb

• Add Description property to Api and HttApi resources (aws#1719)

  

  gruebel

  authored and

  mndeveci

  committed
  ced3a3b

  Copy full SHA for ced3a3b

• Update DEVELOPMENT_GUIDE; moved from rst to md (aws#1778)

  

  hawflau

  authored and

  mndeveci

  committed
  a491913

  Copy full SHA for a491913

• chore: bump version 1.30.0 (aws#1792)

  mndeveci

  committed
  4770c36

  Copy full SHA for 4770c36

• Merge branch 'release/v1.30.0' into fix_conflicts_release_1_30

  mndeveci

  authored
  142a7a9

  Copy full SHA for 142a7a9