Since one query can return multiple series we might be
interested in getting the result for each...

Conflicts:
pkg/services/alerting/commands.go

Due to a bug in golang the 64bit variable i
need to come first to be 64bit aligned.
https://gola...

update pricing to include 1 million free API requests per month

Conflicts:
public/app/plugins/panel/graph/alert_tab_ctrl.ts

Previously, if a user changed the query between
requests, the previous query would not be
cancel...

Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expressi...

Allow the datasource to decide how to handle a
canceled request.

Responsibility is now to pass the cacheKey through
to `datasourceRequest` in each datasources'
i...

Conflicts:
public/app/plugins/datasource/influxdb/query_part.ts

Repeat Prometheus requests with the same query
will cancel preceding requests.

Repeat requests, if they already exist in the
in-flight request map, will cause the previous
req...

Enable the "limit" param in /api/search

Conflicts:
CHANGELOG.md

Commit adds a check whether Organization exists before User is added to
the organization.

Fi...

Conflicts:
pkg/services/sqlstore/migrations/migrations_test.go

Conflicts:
pkg/api/api.go
pkg/setting/setting.go

restart grafana after upgrade