prometheus

mirror of https://github.com/prometheus/prometheus.git synced 2025-09-21 22:01:01 +02:00

History

Jan Fajerski adf5d6bce1 Merge branch 'main' into 3.0-main-sync-24-07-18

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>

Conflicts:
	VERSION
          pick 3.0.0
	promql/promqltest/testdata/histograms.test
          pick changes from c39776c5b5f5e0e7496f8aca3112063a655a50f2,
          but adjust 5m range selectors to 10m to account for
          https://github.com/prometheus/prometheus/pull/13904.
Fixes:
        promql/promqltest/testdata/functions.test
	promql/promqltest/testdata/staleness.test
          Tests added in https://github.com/prometheus/prometheus/pull/9138
          need to be adjusted to account for
          https://github.com/prometheus/prometheus/pull/13904.

2024-07-18 15:56:40 +02:00

api.md

Merge pull request #14109 from harry671003/pass_limit_to_querier

2024-07-12 10:27:52 +01:00

basics.md

Merge branch 'main' into 3.0-main-sync-24-07-18

2024-07-18 15:56:40 +02:00

examples.md

feat: add limitk() and limit_ratio() operators (#12503 )

2024-07-03 22:18:57 +02:00

functions.md

change all lists to bullets