Julien Pivotto fc3fb3265a Merge pull request #7145 from prometheus/release-2.17 ... Backport release 2.17 into master		2020-04-20 14:08:12 +02:00
..
api	Merge pull request #7145 from prometheus/release-2.17	2020-04-20 14:08:12 +02:00
ui	Fix react tests (#7077)	2020-04-01 16:37:52 +02:00
federate_test.go	Use only local tsdb for federation (#7096)	2020-04-07 16:42:42 +01:00
federate.go	register federation failure metrics (#7081)	2020-04-17 22:06:16 +02:00
web_test.go	Use only local tsdb for federation (#7096)	2020-04-07 16:42:42 +01:00
web.go	register federation failure metrics (#7081)	2020-04-17 22:06:16 +02:00