Merge 5.4.2 back into default branch #350
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
sarah-witt
approved these changes
Jul 12, 2023
|
Unsure where the test failures are from; given the security fix commit only changes a web method for the UI. |
|
Hi @daniel-beck the failures seem unrelated/flakes, so we can still merge. We can investigate them in the future. |
sarah-witt
added
the
changelog/Fixed
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.
https://github.com/jenkinsci/datadog-plugin/releases/tag/datadog-5.4.2 was created from a branch. This PR merges the security fix and release commits back into the default branch.
This PR should be merged using merge-commit, not using squash-commit or rebase-commit, to ensure the commits related to the release are in the history of the default branch.
To prevent accidental releases without the fix, I've also locked the default branch here: https://github.com/jenkinsci/datadog-plugin/settings/branches