Merge pull request hashicorp#33646 from hashicorp/release/5.18.x

Merge `release/5.18.x` changes to `main`
opentofu · Sep 27, 2023 · 0ad6928 · 0ad6928
2 parents 48a8e08 + 5b9b183
commit 0ad6928
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.changelog/33630.txt b/.changelog/33630.txt
@@ -0,0 +1,3 @@
+```release-note:note
+documentation: Duplicate CDKTF guides with differing file extensions have been removed to resolve failures in the provider release workflow.
+```
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,12 @@ BUG FIXES:
 * resource/aws_transfer_access: Fail validation if duplicated keys are found in `policy` ([#33570](https://github.com/hashicorp/terraform-provider-aws/issues/33570))
 * resource/aws_transfer_user: Fail validation if duplicated keys are found in `policy` ([#33570](https://github.com/hashicorp/terraform-provider-aws/issues/33570))
 
+## 5.18.1 (September 26, 2023)
+
+NOTES:
+
+* documentation: Duplicate CDKTF guides with differing file extensions have been removed to resolve failures in the provider release workflow. ([#33630](https://github.com/hashicorp/terraform-provider-aws/issues/33630))
+
 ## 5.18.0 (September 21, 2023)
 
 FEATURES: