From 1a2a9f86a5f1c9ca092f7b1d4840c968ab9cae60 Mon Sep 17 00:00:00 2001
From: hc-github-team-tf-provider-devex
 <github-team-tf-provider-devex@hashicorp.com>
Date: Fri, 26 Jan 2024 14:38:10 +0000
Subject: [PATCH] Update changelog

---
 .changes/0.21.0.md                                | 10 ++++++++++
 .changes/unreleased/FEATURES-20240112-153355.yaml |  6 ------
 .changes/unreleased/NOTES-20240112-153501.yaml    |  6 ------
 CHANGELOG.md                                      | 10 ++++++++++
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 .changes/0.21.0.md
 delete mode 100644 .changes/unreleased/FEATURES-20240112-153355.yaml
 delete mode 100644 .changes/unreleased/NOTES-20240112-153501.yaml

diff --git a/.changes/0.21.0.md b/.changes/0.21.0.md
new file mode 100644
index 000000000..d1a9231ae
--- /dev/null
+++ b/.changes/0.21.0.md
@@ -0,0 +1,10 @@
+## 0.21.0 (January 26, 2024)
+
+NOTES:
+
+* tfprotov5+tfprotov6: An upcoming release will require the MoveResourceState implementation as part of ResourceServer ([#364](https://github.com/hashicorp/terraform-plugin-go/issues/364))
+
+FEATURES:
+
+* tfprotov5+tfprotov6: Upgraded protocols and added types to support the `MoveResourceState` RPC ([#364](https://github.com/hashicorp/terraform-plugin-go/issues/364))
+
diff --git a/.changes/unreleased/FEATURES-20240112-153355.yaml b/.changes/unreleased/FEATURES-20240112-153355.yaml
deleted file mode 100644
index 301104955..000000000
--- a/.changes/unreleased/FEATURES-20240112-153355.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: FEATURES
-body: 'tfprotov5+tfprotov6: Upgraded protocols and added types to support the `MoveResourceState`
-  RPC'
-time: 2024-01-12T15:33:55.940212-08:00
-custom:
-  Issue: "364"
diff --git a/.changes/unreleased/NOTES-20240112-153501.yaml b/.changes/unreleased/NOTES-20240112-153501.yaml
deleted file mode 100644
index 08112aada..000000000
--- a/.changes/unreleased/NOTES-20240112-153501.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: NOTES
-body: 'tfprotov5+tfprotov6: An upcoming release will require the MoveResourceState
-  implementation as part of ResourceServer'
-time: 2024-01-12T15:35:01.843365-08:00
-custom:
-  Issue: "364"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5e11ea4e..c3050f923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.21.0 (January 26, 2024)
+
+NOTES:
+
+* tfprotov5+tfprotov6: An upcoming release will require the MoveResourceState implementation as part of ResourceServer ([#364](https://github.com/hashicorp/terraform-plugin-go/issues/364))
+
+FEATURES:
+
+* tfprotov5+tfprotov6: Upgraded protocols and added types to support the `MoveResourceState` RPC ([#364](https://github.com/hashicorp/terraform-plugin-go/issues/364))
+
 ## 0.20.0 (December 14, 2023)
 
 NOTES: