Merge 0.57.1 back into main (#3136)

smithy-lang · Nov 1, 2023 · c7f0d5d · c7f0d5d
2 parents 426e77f + e1a0c94
commit c7f0d5d
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 231 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 <!-- Do not manually edit this file. Use the `changelogger` tool. -->
+November 1st, 2023
+==================
+**New this release:**
+- (client, [smithy-rs#3112](https://github.com/awslabs/smithy-rs/issues/3112), [smithy-rs#3116](https://github.com/awslabs/smithy-rs/issues/3116)) Upgrade `ring` to 0.17.5.
+
+
 October 31st, 2023
 ==================
 **Breaking Changes:**

diff --git a/CHANGELOG.next.toml b/CHANGELOG.next.toml
@@ -11,12 +11,6 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
 # author = "rcoh"
 
-[[smithy-rs]]
-message = "Upgrade `ring` to 0.17.5."
-references = ["smithy-rs#3112", "smithy-rs#3116"]
-meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client" }
-author = "jdisanti"
-
 [[aws-sdk-rust]]
 message = "Fix aws-sdk-rust#930 (PutSnapshotBlock)"
 references = ["smithy-rs#3126", "aws-sdk-rust#930"]