Tobias Guggenmos 4835bbf376 Merge branch 'master' into split_parser		2020-02-19 15:18:13 +01:00
..
api	Merge branch 'master' into split_parser	2020-02-19 15:18:13 +01:00
ui	Adds normalization of localhost urls in targets page react (#6794)	2020-02-17 18:19:15 +01:00
federate.go	Fix build errors in rest of prometheus	2020-02-17 16:09:23 +01:00
federate_test.go	Make lookbackDelta a option of QueryEngine (#6746)	2020-02-10 00:58:23 +01:00
web.go	Moved tsdbconfig to main.	2020-02-18 11:25:36 +00:00
web_test.go	Moved readyStorage to main.	2020-02-17 18:03:57 +00:00