Julien Pivotto 9e265aba10 Merge pull request #7225 from prometheus/release-2.18 ... [Merge without Squash] Merge release-2.18 back to master for 2.18.1 fixes.		2020-05-07 21:23:59 +02:00
..
prometheus	Merge pull request #7225 from prometheus/release-2.18	2020-05-07 21:23:59 +02:00
promtool	replace github.com/prometheus/prometheus/testutil/promlint by github.com/prometheus/client_golang/prometheus/testutil/promlint from our codebase (#7209)	2020-05-07 11:34:39 +01:00