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

revendor cortex to latest master #2543

Merged
merged 1 commit into from
Aug 24, 2020

Conversation

sandeepsukhani
Copy link
Contributor

What this PR does / why we need it:
Updates cortex to latest master. This is just to get the latest query-tee changes from Cortex.

@codecov-commenter
Copy link

Codecov Report

Merging #2543 into master will increase coverage by 0.10%.
The diff coverage is 14.28%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2543      +/-   ##
==========================================
+ Coverage   63.54%   63.65%   +0.10%     
==========================================
  Files         163      163              
  Lines       14325    14325              
==========================================
+ Hits         9103     9118      +15     
+ Misses       4507     4489      -18     
- Partials      715      718       +3     
Impacted Files Coverage Δ
cmd/querytee/main.go 0.00% <0.00%> (ø)
pkg/logcli/query/query.go 38.65% <0.00%> (ø)
cmd/querytee/response_comparator.go 89.18% <100.00%> (ø)
pkg/logql/evaluator.go 92.47% <0.00%> (-0.41%) ⬇️
pkg/querier/queryrange/downstreamer.go 97.93% <0.00%> (+2.06%) ⬆️
pkg/promtail/positions/positions.go 59.64% <0.00%> (+13.15%) ⬆️

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM

@sandeepsukhani sandeepsukhani merged commit 501f93f into grafana:master Aug 24, 2020
@sandeepsukhani sandeepsukhani deleted the revendor-cortex branch September 15, 2020 12:32
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.

3 participants