Fabian Reinartz 53875da7fb Merge pull request #3286 from prometheus/dev-2.0 ... Dev 2.0		2017-10-12 16:19:10 +02:00
..
api	Merge branch 'master' into dev-2.0	2017-10-07 13:37:21 +02:00
ui	Add UI warning for time drift >30 seconds (#3276)	2017-10-11 15:11:04 +02:00
federate_test.go	Merge branch 'master' into dev-2.0	2017-09-04 14:09:21 +02:00
federate.go	Re-add contexts to storage.Storage.Querier() (#3230)	2017-10-04 21:04:15 +02:00
web_test.go	Merge pull request #3286 from prometheus/dev-2.0	2017-10-12 16:19:10 +02:00
web.go	Merge branch 'master' into dev-2.0	2017-10-07 13:37:21 +02:00