Tom Wilkie 73fa721dd2 Merge pull request #3569 from EdSchouten/faster-federation ... Deprecate DeduplicateSeriesSet() in favor of NewMergeSeriesSet().		2017-12-11 09:37:15 -06:00
..
api	Deprecate DeduplicateSeriesSet() in favor of NewMergeSeriesSet().	2017-12-10 19:51:20 +01:00
ui	Correctly handle empty data set in the console view (#3521)	2017-11-30 10:04:02 +00:00
federate.go	Deprecate DeduplicateSeriesSet() in favor of NewMergeSeriesSet().	2017-12-10 19:51:20 +01:00
federate_test.go	use httptest.NewRequest, remove http.ReadRequest (#3557)	2017-12-07 23:52:50 +08:00
web.go	Fix 'addrConn.resetTransport' error (#3004) (#3517)	2017-12-11 21:39:58 +08:00
web_test.go	Merge pull request #3286 from prometheus/dev-2.0	2017-10-12 16:19:10 +02:00