From d8f64c6e8e4e63b50367a5927c844b172ecbfb54 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Sat, 21 Dec 2024 21:02:30 +0000
Subject: [PATCH 1/2] release: 24.12.1

---
 .env         | 10 +++++-----
 CHANGELOG.md |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 5688114306..c17453c64b 100644
--- a/.env
+++ b/.env
@@ -9,11 +9,11 @@ SENTRY_EVENT_RETENTION_DAYS=90
 SENTRY_BIND=9000
 # Set SENTRY_MAIL_HOST to a valid FQDN (host/domain name) to be able to send emails!
 # SENTRY_MAIL_HOST=example.com
-SENTRY_IMAGE=getsentry/sentry:nightly
-SNUBA_IMAGE=getsentry/snuba:nightly
-RELAY_IMAGE=getsentry/relay:nightly
-SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
-VROOM_IMAGE=getsentry/vroom:nightly
+SENTRY_IMAGE=getsentry/sentry:24.12.1
+SNUBA_IMAGE=getsentry/snuba:24.12.1
+RELAY_IMAGE=getsentry/relay:24.12.1
+SYMBOLICATOR_IMAGE=getsentry/symbolicator:24.12.1
+VROOM_IMAGE=getsentry/vroom:24.12.1
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=1m30s
 HEALTHCHECK_RETRIES=10
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c08109c3f9..56d9cfebee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 24.12.1
+
+### Various fixes & improvements
+
+- chore: clearer message for errors-only mode (#3487) by @aldy505
+- chore(relay): provide opt-in max_memory_percent config as workaround for failing healthcheck (#3486) by @aldy505
+- fix(nginx): _assets should rewrite to _static/sentry/dist (#3483) by @BYK
+
 ## 24.12.0
 
 - No documented changes.

From 4fa0833fd76537d3f7c09765f80e5ef82c9bc0f4 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@getsentry.com>
Date: Sat, 21 Dec 2024 21:26:04 +0000
Subject: [PATCH 2/2] build: Set master version to nightly

#skip-changelog
---
 .env | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index c17453c64b..5688114306 100644
--- a/.env
+++ b/.env
@@ -9,11 +9,11 @@ SENTRY_EVENT_RETENTION_DAYS=90
 SENTRY_BIND=9000
 # Set SENTRY_MAIL_HOST to a valid FQDN (host/domain name) to be able to send emails!
 # SENTRY_MAIL_HOST=example.com
-SENTRY_IMAGE=getsentry/sentry:24.12.1
-SNUBA_IMAGE=getsentry/snuba:24.12.1
-RELAY_IMAGE=getsentry/relay:24.12.1
-SYMBOLICATOR_IMAGE=getsentry/symbolicator:24.12.1
-VROOM_IMAGE=getsentry/vroom:24.12.1
+SENTRY_IMAGE=getsentry/sentry:nightly
+SNUBA_IMAGE=getsentry/snuba:nightly
+RELAY_IMAGE=getsentry/relay:nightly
+SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
+VROOM_IMAGE=getsentry/vroom:nightly
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=1m30s
 HEALTHCHECK_RETRIES=10