From 3b492efad7307af3e0a4fcccecfd741437e3d230 Mon Sep 17 00:00:00 2001
From: Ben Ye <benye@amazon.com>
Date: Tue, 7 Nov 2023 07:23:14 -0800
Subject: [PATCH] Merge release 1.15 to master (#5637)

* upgrade to go 1.20.4 (#5299) (#5331)

* upgrade to go 1.20.3

* align on pr name ?

* Update build-image/Dockerfile




* Update test-build-deploy.yml with build image tag



* Update Makefile



* Remove python-request and python-yaml in build-image/Dockerfile



---------

Signed-off-by: rokh-conduktor <88239458+rokh-conduktor@users.noreply.github.com>
Signed-off-by: Alvin Lin <alvinlin123@gmail.com>
Co-authored-by: rokh-conduktor <88239458+rokh-conduktor@users.noreply.github.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Release and bump version to 1.15.2 (#5336)

* Bump version to 1.15.2

Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

* Add entry to change log for 1.15.2 release

Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

---------

Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

* Release 1.15 (#5423)

* Do not reuse remote write requests in case of error (#5422)

* Do not reuse remote write requests in case of error

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Changelog

Signed-off-by: Alan Protasio <alanprot@gmail.com>

---------

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Release and bump version to 1.15.3

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Fix Changelog

Signed-off-by: Alan Protasio <alanprot@gmail.com>

---------

Signed-off-by: Alan Protasio <alanprot@gmail.com>

---------

Signed-off-by: rokh-conduktor <88239458+rokh-conduktor@users.noreply.github.com>
Signed-off-by: Alvin Lin <alvinlin123@gmail.com>
Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Alvin Lin <alvinlin@amazon.com>
Co-authored-by: rokh-conduktor <88239458+rokh-conduktor@users.noreply.github.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>
Co-authored-by: Alan Protasio <approtas@amazon.com>
---
 CHANGELOG.md | 10 ++++++++--
 VERSION      |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e25c9b55e..ad6fe0cbb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,7 +51,6 @@
 * [ENHANCEMENT] Support object storage backends for runtime configuration file. #5292
 * [ENHANCEMENT] Query Frontend: Reject subquery with too small step size. #5323
 * [ENHANCEMENT] Compactor: Exposing Thanos accept-malformed-index to Cortex compactor. #5334
-* [ENHANCEMENT] Update Go version to 1.20.4. #5299
 * [ENHANCEMENT] Log: Avoid expensive log.Valuer evaluation for disallowed levels. #5297
 * [ENHANCEMENT] Improving Performance on the API Gzip Handler. #5347
 * [ENHANCEMENT] Dynamodb: Add `puller-sync-time` to allow different pull time for ring. #5357
@@ -87,7 +86,6 @@
 * [BUGFIX] Compactor: Partial block with only visit marker should be deleted even there is no deletion marker. #5342
 * [BUGFIX] KV: Etcd calls will no longer block indefinitely and will now time out after the DialTimeout period. #5392
 * [BUGFIX] Ring: Allow RF greater than number of zones to select more than one instance per zone #5411
-* [BUGFIX] Distributor: Fix potential data corruption in cases of timeout between distributors and ingesters. #5422
 * [BUGFIX] Store Gateway: Fix bug in store gateway ring comparison logic. #5426
 * [BUGFIX] Ring: Fix bug in consistency of Get func in a scaling zone-aware ring. #5429
 * [BUGFIX] Query Frontend: Fix bug of failing to cancel downstream request context in query frontend v2 mode (query scheduler enabled). #5447
@@ -100,6 +98,14 @@
 * [BUGFIX] Ruler: Fix bug on ruler where a failure to load a single RuleGroup would prevent rulers to sync all RuleGroup. #5563
 * [BUGFIX] Store-Gateway and AlertManager: Add a `wait_instance_time_out` to WaitInstanceState context to avoid waiting forever. #5581
 
+## 1.15.3 2023-06-22
+
+* [BUGFIX] Distributor: Fix potential data corruption in cases of timeout between distributors and ingesters. #5422
+
+## 1.15.2 2023-05-09
+
+* [ENHANCEMENT] Update Go version to 1.20.4. #5299
+
 ## 1.15.1 2023-04-26
 
 * [CHANGE] Alertmanager: Validating new fields on the PagerDuty AM config. #5290
diff --git a/VERSION b/VERSION
index ace44233b4..f2380cc7ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.15.1
+1.15.3