Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.03 backport] vendor: bump gopkg.in/yaml.v2 v2.2.8 #2470

Merged
merged 1 commit into from
Apr 30, 2020

Conversation

thaJeztah
Copy link
Member

backport of #2298
minor conflict in vendor.conf, due to other dependencies being updated on master

full diff: go-yaml/yaml@v2.2.3...v2.2.8

includes:

  • go-yaml/yaml 515 Improve heuristics preventing CPU/memory abuse
  • go-yaml/yaml@f90ceb4 Fix check for non-map alias merging in v2
    • fix for "yaml.Unmarshal crashes on "assignment to entry in nil map""
  • go-yaml/yaml 543 Port stale simple_keys fix to v2
  • go-yaml/yaml@1f64d61 Fix issue in simple_keys improvements
    • fixes "Invalid simple_keys now cause panics later in decode"
  • go-yaml/yaml 555 Optimize cases with long potential simple_keys

full diff: go-yaml/yaml@v2.2.3...v2.2.8

includes:

- go-yaml/yaml 515 Improve heuristics preventing CPU/memory abuse
- go-yaml/yaml@f90ceb4 Fix check for non-map alias merging in v2
    - fix for "yaml.Unmarshal crashes on "assignment to entry in nil map""
- go-yaml/yaml 543 Port stale simple_keys fix to v2
- go-yaml/yaml@1f64d61 Fix issue in simple_keys improvements
    - fixes "Invalid simple_keys now cause panics later in decode"
- go-yaml/yaml 555 Optimize cases with long potential simple_keys

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3dfcfbb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 19.03.9 milestone Apr 28, 2020
Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit 7a2de81 into docker:19.03 Apr 30, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_bump_yaml branch April 30, 2020 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants