Merge release 1.11 to master #4569
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
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
…o rc.1 (#4548) * Disable S3 SSE integration tests (#4545) Signed-off-by: Marco Pracucci <marco@pracucci.com> * Update go-kit/kit to 0.12.0 to fix spurious debug logs This version of go-kit/kit/log is just a pass-through to go-kit/log. Also updates the following: * github.com/go-kit/log from v0.1.0 to v0.2.0 * github.com/json-iterator/go from v1.1.11 to v1.1.12 * golang.org/x/net from ad29c8ab022f to 978cfadd31cf Pinned aws-sdk to previous version, to reduce the amount of change. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * compactor unit tests: make log messages consistent Apparently updating go-kit has made our log lines more consistent Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Bump to rc.1 Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Co-authored-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
…to-master Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
pracucci
approved these changes
Nov 25, 2021
alvinlin123
pushed a commit
to ac1214/cortex
that referenced
this pull request
Jan 14, 2022
* Release v1.11.0 (cortexproject#4567) Also fix up a few CHANGELOG lines that had gone into the wrong sequence. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Signed-off-by: Alvin Lin <alvinlin@amazon.com>
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.
I fixed up a few CHANGELOG lines that had gone into the wrong sequence.