Skip to content
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

Merge release-0.17 branch back #3553

Merged
merged 7 commits into from
Dec 9, 2020

Conversation

metalmatze
Copy link
Contributor

Merge release-0.17 back into master.
Please let me know if I rebased things correctly @yeya24 @GiedriusS.

yeya24 and others added 7 commits December 9, 2020 12:16
* query-frontend: make POST-request to downstream url for labels and series api endpoints (thanos-io#3444)

Signed-off-by: Alexander Tunik <2braven@gmail.com>

* remove default response cache config

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* ensure order when merging multiple responses

Signed-off-by: Ben Ye <yb532204897@gmail.com>

Co-authored-by: Alexander Tunik <2braven@gmail.com>
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
* fix index out of bound bug when comparing ZLabelSets

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* fix param parsing error message

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* address comment feedbacks

Signed-off-by: Ben Ye <yb532204897@gmail.com>
Do not cleanup blocks on boot because in some very bad cases there could
be thousands of blocks ready-to-be deleted and doing that makes Thanos
Compact exceed `initialDelaySeconds` on k8s.

Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
@metalmatze metalmatze changed the title Release 0.17 mergeback Merge release-0.17 branch back Dec 9, 2020
Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯 LGTM

@bwplotka bwplotka merged commit 076985c into thanos-io:master Dec 9, 2020
@bwplotka
Copy link
Member

bwplotka commented Dec 9, 2020

Thanks!

@metalmatze metalmatze deleted the release-0.17-mergeback branch December 9, 2020 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants