Merge release 1.5 (again, without squash-merge this time) #3482
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: Chris Marchbanks <[email protected]>
Signed-off-by: Chris Marchbanks <[email protected]>
Signed-off-by: Chris Marchbanks <[email protected]>
…ion (#3436) * fix: register querier routes explicitly with handler for instrumentation Signed-off-by: Jacob Lisi <[email protected]> * fix: use legacy prefix for querier routes Signed-off-by: Jacob Lisi <[email protected]> * remove unneeded changelog entry Signed-off-by: Jacob Lisi <[email protected]> * ensure the internal querier router uses the Server prefix Signed-off-by: Jacob Lisi <[email protected]> * simplify prefixes Signed-off-by: Jacob Lisi <[email protected]> * fix import issue caused by IDE Signed-off-by: Jacob Lisi <[email protected]>
#3439) Signed-off-by: Jacob Lisi <[email protected]>
Signed-off-by: Chris Marchbanks <[email protected]>
* Cut release 1.5.0 * Update versions in k8s/ and docs/ Signed-off-by: Chris Marchbanks <[email protected]>
pracucci
approved these changes
Nov 10, 2020
pstibrany
changed the title
…e-1.5 Signed-off-by: Peter Štibraný <[email protected]>
csmarchbanks
suggested changes
Nov 10, 2020
Great thanks! I've tried manually, and it didn't let me, hence the PR. Closing this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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: Follow-up to #3479, without squash merge. This is important to make release tags reachable from master.