search

free / prometheus

The Prometheus monitoring system and time series database.
https://prometheus.io/
Apache License 2.0
48 stars 5 forks source link

x-rate patch conflicts on v2.20.1 #14

Closed sylr closed 2 years ago

sylr commented 4 years ago

Hi @free 👋

Once again it is not possible to apply your patch on the latest prometheus release.

Would it be possible to you to take a look ?

Thank you.

sylr commented 4 years ago

It seems that the same code has also been modified between v2.20.1 and v2.21.0-rc.1 so if you make a new patch based on v2.20.1 it will conflict again on the future v2.21.0.