Conor Broderick b5c30090b9 Merge pull request #3544 from Conorbro/relabel ... Added service discovery view showing labels before and after relabelling		2017-12-13 17:33:55 +00:00
..
api	Merge pull request #3570 from Gouthamve/colon-snapshot	2017-12-11 19:04:10 -08:00
ui	Added service discovery view showing labels before and after relabelling	2017-12-13 15:46:11 +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	Merge pull request #3544 from Conorbro/relabel	2017-12-13 17:33:55 +00:00
web_test.go	Merge pull request #3286 from prometheus/dev-2.0	2017-10-12 16:19:10 +02:00