Tom Wilkie 746752b946 Merge external labels in order.

2017-10-26 11:44:49 +01:00

..

api

Merge external labels in order.

2017-10-26 11:44:49 +01:00

ui

Fix invalid syntax in graph.css (#3309)

2017-10-24 10:48:58 +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

Migrate "golang.org/x/net/context" -> "context" (#3333)

2017-10-24 21:21:42 -07:00