Harkishen-Singh cadf8f11bc Resolve conflicts. ... Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>		2020-08-18 12:36:03 +05:30
..
api	tsdb: Added ChunkQueryable implementations to db; unified MergeSeriesSets and vertical to single struct. (#7069)	2020-07-31 16:03:02 +01:00
ui	Resolve conflicts.	2020-08-18 12:36:03 +05:30
federate.go	*: Consistent Error/Warning handling for SeriesSet iterator: Allowing Async Select (#7251)	2020-06-09 17:57:31 +01:00
federate_test.go	Fixed wrongly handled not ready TSDB on web and API. (#7182)	2020-04-29 17:16:14 +01:00
web.go	Stop CMUX and GRPC servers even with stale connections (#7810)	2020-08-17 09:50:32 +01:00
web_test.go	Stop CMUX and GRPC servers even with stale connections (#7810)	2020-08-17 09:50:32 +01:00