Skip to content

Merge release 1.16 to master #5891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2024

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Apr 25, 2024

What this PR does:

Merge release 1.16 to master to include new changes from the 1.16.1 release.

Note: please don't merge this PR using squash!!!

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

yeya24 and others added 3 commits April 24, 2024 10:39
* Upgrade Alpine to 3.18 (cortexproject#5684)

* Upgrade Alpine to 3.18

Signed-off-by: Daniel Sabsay <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Daniel Sabsay <[email protected]>

---------

Signed-off-by: Daniel Sabsay <[email protected]>
Co-authored-by: Daniel Sabsay <[email protected]>

* Upgrade to go 1.21.9 (cortexproject#5879)

* Upgrade to go 1.21.9

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Update changelog and workflows

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Not use minor version for now. Needs more investigation

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Update image again

Signed-off-by: Friedrich Gonzalez <[email protected]>

---------

Signed-off-by: Friedrich Gonzalez <[email protected]>

* fix go version for integration tests (cortexproject#5882)

Signed-off-by: Friedrich Gonzalez <[email protected]>

* include cortexproject#5882 to changelog

Signed-off-by: Ben Ye <[email protected]>

try fixing lint

Signed-off-by: Ben Ye <[email protected]>

try again

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Daniel Sabsay <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Co-authored-by: Daniel Sabsay <[email protected]>
Co-authored-by: Daniel Sabsay <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
@alanprot
Copy link
Member

Thanks!

@yeya24 yeya24 merged commit f9cb3ea into cortexproject:master Apr 25, 2024
16 checks passed
@yeya24 yeya24 deleted the merge-release-1.16-to-master branch April 25, 2024 04:18
@yeya24
Copy link
Contributor Author

yeya24 commented Apr 25, 2024

My bad I squashed the commits as well :(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants