mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
* Mixed-ds: Return both results from the same datasource * fix mixed data source * Change concatMap to mergeMap * Make sure to return correct state at the end * Make sure to count the targets as well * Use Marcus's version * Fix stict error * Apply suggestions from code review Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com> Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>