From 322573c641c2ba7f9ff0c6cf917a552708246985 Mon Sep 17 00:00:00 2001
From: hc-github-team-tf-core <github-team-tf-core@hashicorp.com>
Date: Wed, 22 Jan 2025 16:35:58 +0000
Subject: [PATCH] Prepare before 1.10.5 release

---
 .changes/1.10.5.md                                 | 12 ++++++++++++
 .changes/backported/BUG FIXES-20250122-082755.yaml |  5 -----
 .changes/backported/BUG FIXES-20250122-083138.yaml |  5 -----
 .changes/backported/BUG FIXES-20250122-110052.yaml |  5 -----
 CHANGELOG.md                                       | 12 +++++++++++-
 version/VERSION                                    |  2 +-
 6 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 .changes/1.10.5.md
 delete mode 100644 .changes/backported/BUG FIXES-20250122-082755.yaml
 delete mode 100644 .changes/backported/BUG FIXES-20250122-083138.yaml
 delete mode 100644 .changes/backported/BUG FIXES-20250122-110052.yaml

diff --git a/.changes/1.10.5.md b/.changes/1.10.5.md
new file mode 100644
index 000000000000..15acdaf70855
--- /dev/null
+++ b/.changes/1.10.5.md
@@ -0,0 +1,12 @@
+## 1.10.5 (January 22, 2025)
+
+
+BUG FIXES:
+
+* element(...): no longer crashes when asked for a negative index into a tuple. ([#36376](https://github.com/hashicorp/terraform/issues/36376))
+
+* Updated dependency `github.com/hashicorp/go-slug` `v0.16.0` => `v0.16.3` to integrate latest changes (fix for CVE-2025-0377) ([#36273](https://github.com/hashicorp/terraform/issues/36273))
+
+* jsondecode(...): improved error message when objects contain duplicate keys ([#36376](https://github.com/hashicorp/terraform/issues/36376))
+
+
diff --git a/.changes/backported/BUG FIXES-20250122-082755.yaml b/.changes/backported/BUG FIXES-20250122-082755.yaml
deleted file mode 100644
index b87b436425c5..000000000000
--- a/.changes/backported/BUG FIXES-20250122-082755.yaml	
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: BUG FIXES
-body: 'element(...): no longer crashes when asked for a negative index into a tuple.'
-time: 2025-01-22T08:27:55.793401+01:00
-custom:
-    Issue: "36376"
diff --git a/.changes/backported/BUG FIXES-20250122-083138.yaml b/.changes/backported/BUG FIXES-20250122-083138.yaml
deleted file mode 100644
index 5c2842c6f44b..000000000000
--- a/.changes/backported/BUG FIXES-20250122-083138.yaml	
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: BUG FIXES
-body: Updated dependency `github.com/hashicorp/go-slug` `v0.16.0` => `v0.16.3` to integrate latest changes (fix for CVE-2025-0377)
-time: 2025-01-22T08:31:38.004275+01:00
-custom:
-    Issue: "36273"
diff --git a/.changes/backported/BUG FIXES-20250122-110052.yaml b/.changes/backported/BUG FIXES-20250122-110052.yaml
deleted file mode 100644
index 6b1f98571fb3..000000000000
--- a/.changes/backported/BUG FIXES-20250122-110052.yaml	
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: BUG FIXES
-body: 'jsondecode(...): improved error message when objects contain duplicate keys'
-time: 2025-01-22T11:00:52.861759+01:00
-custom:
-    Issue: "36376"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4a73bf0e871..e0686a3617bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
-## 1.10.5 (Unreleased)
+## 1.10.5 (January 22, 2025)
+
+
+BUG FIXES:
+
+* element(...): no longer crashes when asked for a negative index into a tuple. ([#36376](https://github.com/hashicorp/terraform/issues/36376))
+
+* Updated dependency `github.com/hashicorp/go-slug` `v0.16.0` => `v0.16.3` to integrate latest changes (fix for CVE-2025-0377) ([#36273](https://github.com/hashicorp/terraform/issues/36273))
+
+* jsondecode(...): improved error message when objects contain duplicate keys ([#36376](https://github.com/hashicorp/terraform/issues/36376))
+
 
 ## 1.10.4 (January 8, 2025)
 
diff --git a/version/VERSION b/version/VERSION
index 3e5a73e8a45f..db77e0ee9760 100644
--- a/version/VERSION
+++ b/version/VERSION
@@ -1 +1 @@
-1.10.5-dev
+1.10.5