Merge branch 'main' into merge-back/2.114.1

aws · Dec 6, 2023 · 3688926 · 3688926
2 parents 02bbb1d + 94cc5b6
commit 3688926
Show file tree

Hide file tree

Showing 257 changed files with 42 additions and 65,390 deletions.
diff --git a/.github/workflows/github-merit-badger.yml b/.github/workflows/github-merit-badger.yml
@@ -17,4 +17,4 @@ jobs:
           badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
           thresholds: '[0,3,6,13,25,50]'
           badge-type: 'achievement'
-          ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,aws-cdk-automation,dependabot[bot],mergify[bot]]'
+          ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,aws-cdk-automation,dependabot[bot],mergify[bot]]'
diff --git a/.mergify.yml b/.mergify.yml
@@ -11,7 +11,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|corymhall|peterwoodworth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar)$
+      - author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|corymhall|peterwoodworth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:

diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/.eslintrc.js b/packages/@aws-cdk/aws-apigatewayv2-alpha/.eslintrc.js
diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/.gitignore b/packages/@aws-cdk/aws-apigatewayv2-alpha/.gitignore
diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/.npmignore b/packages/@aws-cdk/aws-apigatewayv2-alpha/.npmignore
diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/LICENSE b/packages/@aws-cdk/aws-apigatewayv2-alpha/LICENSE
diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/NOTICE b/packages/@aws-cdk/aws-apigatewayv2-alpha/NOTICE