From 0e5b1a7c5d036b30b4574bb04d6e97124a90b872 Mon Sep 17 00:00:00 2001 From: Ieva Date: Tue, 20 Sep 2022 17:26:45 +0100 Subject: [PATCH] resolve merge conflicts (#55508) Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> --- CHANGELOG.md | 25 +++++++++++++++++++ docs/sources/release-notes/_index.md | 2 ++ .../release-notes/release-notes-8-5-13.md | 16 ++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 docs/sources/release-notes/release-notes-8-5-13.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 911e7bc77a2..89d1c701c5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ + + +# 8.5.13 (2022-09-20) + +### Features and enhancements + +- **Plugins:** Expose @emotion/react to plugins to prevent load failures. [#55297](https://github.com/grafana/grafana/pull/55297), [@jackw](https://github.com/jackw) + +### Bug fixes + +- **AuthNZ:** Security fixes for CVE-2022-35957 and CVE-2022-36062. [#55495](https://github.com/grafana/grafana/pull/55495), [@IevaVasiljeva](https://github.com/IevaVasiljeva) + + + + + +# 8.5.11 (2022-08-30) + +### Features and enhancements + +- **Rendering:** Add support for renderer token (#54425). [#54438](https://github.com/grafana/grafana/pull/54438), [@joanlopez](https://github.com/joanlopez) +- **Alerting:** AlertingProxy to elevate permissions for request forwarded to data proxy when RBAC enabled. [#53681](https://github.com/grafana/grafana/pull/53681), [@yuri-tceretian](https://github.com/yuri-tceretian) + + + # 8.5.10 (2022-08-08) diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md index 192ce37540d..8d6d5e6216e 100644 --- a/docs/sources/release-notes/_index.md +++ b/docs/sources/release-notes/_index.md @@ -10,6 +10,8 @@ weight: 10000 Here you can find detailed release notes that list everything that is included in every release as well as notices about deprecations, breaking changes as well as changes that relate to plugin development. +- [Release notes for 8.5.13]({{< relref "release-notes-8-5-13" >}}) +- [Release notes for 8.5.11]({{< relref "release-notes-8-5-11" >}}) - [Release notes for 8.5.10]({{< relref "release-notes-8-5-10" >}}) - [Release notes for 8.5.9]({{< relref "release-notes-8-5-9" >}}) - [Release notes for 8.5.6]({{< relref "release-notes-8-5-6" >}}) diff --git a/docs/sources/release-notes/release-notes-8-5-13.md b/docs/sources/release-notes/release-notes-8-5-13.md new file mode 100644 index 00000000000..62efce36d67 --- /dev/null +++ b/docs/sources/release-notes/release-notes-8-5-13.md @@ -0,0 +1,16 @@ ++++ +title = "Release notes for Grafana 8.5.13" +hide_menu = true ++++ + + + +# Release notes for Grafana 8.5.13 + +### Features and enhancements + +- **Plugins:** Expose @emotion/react to plugins to prevent load failures. [#55297](https://github.com/grafana/grafana/pull/55297), [@jackw](https://github.com/jackw) + +### Bug fixes + +- **AuthNZ:** Security fixes for CVE-2022-35957 and CVE-2022-36062. [#55495](https://github.com/grafana/grafana/pull/55495), [@IevaVasiljeva](https://github.com/IevaVasiljeva)