Bugfix release for v2.6 to fix CVE-2023-24538 #4798
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aldernero
changed the title
charleskorn
reviewed
Apr 21, 2023
56quarters
approved these changes
Apr 21, 2023
56quarters
pushed a commit
that referenced
this pull request
Apr 21, 2023
* Rewrite aliases to be relative (#4116) (#4145) Absolute aliases containing versions can redirect "latest" content to old versions when a page has been removed in newer versions. Relative aliases behave consistently across versions. Signed-off-by: Jack Baldry <jack.baldry@grafana.com> (cherry picked from commit f0c92b8) Co-authored-by: Jack Baldry <jack.baldry@grafana.com> * Update publishing workflows to use organization secret (#4166) (#4169) The new tokens are managed centrally and have a longer expiry. Administrators of the grafanabot account will be notified of the pending expiry and the secret can be rotated centrally without the need for a repository administrator to update their secrets. The existing repository secrets can safely be removed. The tokens for those secrets will be removed by the end of this week. Signed-off-by: Jack Baldry <jack.baldry@grafana.com> (cherry picked from commit e22be74) Co-authored-by: Jack Baldry <jack.baldry@grafana.com> * Bugfix release for v2.6 to fix CVE-2023-24538 (#4798) * Bugfix release to fix CVE-2023-24538 * updated jsonnet tests * fixed Makefile merge * updated Makefile * update .golangci.yml * make doc * Update v2.6.md --------- Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update 2.6 release notes with go bugfix (#4811) Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Co-authored-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: Vernon Miller <96601789+aldernero@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
Updates release 2.6 with changes from #4773 to address CVE-2023-24538
This will bump the version from 2.6 to 2.6.1.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]