Krasi Georgiev 587dec9eb9 rebased and resolved conflicts with the new Discovery GUI page ... Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>		2017-12-18 20:10:03 +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_test.go	use httptest.NewRequest, remove http.ReadRequest (#3557)	2017-12-07 23:52:50 +08:00
federate.go	Deprecate DeduplicateSeriesSet() in favor of NewMergeSeriesSet().	2017-12-10 19:51:20 +01:00
web_test.go	fixed the tests	2017-12-18 17:22:50 +00:00
web.go	rebased and resolved conflicts with the new Discovery GUI page	2017-12-18 20:10:03 +00:00