Sync 6.x with 6.22.0 #2025
Merged
Sync 6.x with 6.22.0 #2025
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
…astic#1989) * CONTRIBUTING: open PRs to the main branch * CONTRIBUTING: add more hints on what you need to setup for releasing Fixes elastic#1991
… (elastic#2016) Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>
Bumps the github-actions group with 1 update: [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact). Updates `geekyeggo/delete-artifact` from 4.1.0 to 5.0.0 - [Release notes](https://github.com/geekyeggo/delete-artifact/releases) - [Changelog](https://github.com/GeekyEggo/delete-artifact/blob/main/CHANGELOG.md) - [Commits](GeekyEggo/delete-artifact@6504143...24928e7) --- updated-dependencies: - dependency-name: geekyeggo/delete-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* utils: add simplejson based JSON handling Add an alternative json serialization and deserialization implementation using simplejson configured to be JSON compliant by converting floats like nan, +inf and -inf to null . The idea is to permit users to use a different serialization if they need a different behaviour. Refs elastic#1886 * client: fix overriding of transport json serializer We get a string from config so need to import it.
For some reason tests passed with this but now are failing because pytest test does not recognize skipIf.
Otherwise it'll skip tests becasue flask import does not work.
basepi
approved these changes
Apr 3, 2024
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 does this pull request do?
Sync 6.x branch with tagged 6.22.0