Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

[release/1.3 backport] vendor: bump gopkg.in/yaml.v2 v2.2.8 #1394

Merged
merged 1 commit into from
Feb 4, 2020

Conversation

thaJeztah
Copy link
Member

back port of #1387 for the 1.3 branch

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

includes:

  • 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 [email protected]
(cherry picked from commit 3d0818d)
Signed-off-by: Sebastiaan van Stijn [email protected]

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

includes:

- 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 <[email protected]>
(cherry picked from commit 3d0818d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

@dmcgowan @mikebrow ptal

Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow merged commit 50b9e10 into containerd:release/1.3 Feb 4, 2020
@thaJeztah thaJeztah deleted the 1.3_backport_bump_yaml branch February 4, 2020 16:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants