mirror of
https://github.com/prometheus/prometheus.git
synced 2025-01-17 16:57:46 -08:00
adf5d6bce1
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
Conflicts:
VERSION
pick 3.0.0
promql/promqltest/testdata/histograms.test
pick changes from
|
||
---|---|---|
.. | ||
aggregators.test | ||
at_modifier.test | ||
collision.test | ||
functions.test | ||
histograms.test | ||
limit.test | ||
literals.test | ||
native_histograms.test | ||
operators.test | ||
range_queries.test | ||
selectors.test | ||
staleness.test | ||
subquery.test | ||
trig_functions.test |