Merge release 1.15 to master #5637
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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>
* 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>
* Do not reuse remote write requests in case of error (cortexproject#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: Ben Ye <benye@amazon.com>
friedrichg
approved these changes
Nov 7, 2023
|
Let's make sure we don't merge this pr using We should add a merge commit instead. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Just realized that we never merged release-1.15 branch back to master when releasing 1.15.2 and 1.15.3.
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]