Skip to content

Conversation

@sandeepsukhani
Copy link
Contributor

What this PR does / why we need it:
Revendors cortex to latest master.

Special notes for your reviewer:
Takes care of a removed cortex flag cortexproject/cortex#3145

Checklist

  • Tests updated

@codecov-commenter
Copy link

codecov-commenter commented Sep 15, 2020

Codecov Report

Merging #2627 into master will decrease coverage by 0.10%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2627      +/-   ##
==========================================
- Coverage   62.97%   62.86%   -0.11%     
==========================================
  Files         170      170              
  Lines       15049    15049              
==========================================
- Hits         9477     9461      -16     
- Misses       4809     4828      +19     
+ Partials      763      760       -3     
Impacted Files Coverage Δ
pkg/loki/modules.go 4.15% <0.00%> (ø)
pkg/promtail/positions/positions.go 46.49% <0.00%> (-13.16%) ⬇️
pkg/promtail/targets/file/filetarget.go 66.28% <0.00%> (-0.58%) ⬇️

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.

Can you add a note in the upgrade guide about this flag change?
otherwise LGTM

@sandeepsukhani sandeepsukhani merged commit 337db2f into grafana:master Sep 16, 2020
@sandeepsukhani sandeepsukhani deleted the revendor-cortex branch October 5, 2020 11:31
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