Rebase xrate against release-2.7

free / prometheus

The Prometheus monitoring system and time series database.

https://prometheus.io/

Apache License 2.0

48 stars 4 forks source link

Rebase xrate against release-2.7 #8

Closed sylr closed 5 years ago

sylr commented 5 years ago

Hi!

@free Would it be possible for you to rebase your patch against prometheus/release-2.7 ?

Regards.

sylr commented 5 years ago

I've tried myself but there seems to be a small conflict with the subquery patch and you are far more qualified than me to resolve it.

free commented 5 years ago

I have merged the ~2.7.0 master into the xrate branch, just before releasing 2.7.0-xrate. Which is also available as a tag, in case you want the exact code from which the release was made.

It is not a rebase, it's a merge, but I hope that's good enough for your purposes.