Conor Broderick 84eca7dfb2 Merge pull request #3491 from Conorbro/eval-rules ... Add rule evaluation time		2017-11-22 16:37:16 +00:00
..
api	Review feedback	2017-11-16 16:30:48 +01:00
ui	Add rule evaluation time	2017-11-22 15:22:02 +00: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	Refactor main.go with oklog/pkg/group actors pattern	2017-11-11 12:33:15 +00:00