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

bump imdario/mergo v0.3.12 #3304

Merged
merged 1 commit into from Oct 1, 2021
Merged

bump imdario/mergo v0.3.12 #3304

merged 1 commit into from Oct 1, 2021

Conversation

MisterWS
Copy link
Contributor

- What I did
Bumps mergo from v0.3.8 to v0.3.12

full diff: imdario/mergo@v0.3.8...v0.3.12

includes:

Signed-off-by: Jonathan Warriss-Simmons misterws@diogenes.ws

- How I did it
Updated vendor.conf

- How to verify it
Existing unit tests should cover everything - as it's just a bump in version. However, it's my first time contributing, so I'd appreciate a check of that!

- Description for the changelog

Bumps mergo dependency from v0.3.8 to v0.3.12

- A picture of a cute animal (not mandatory but encouraged)

full diff: imdario/mergo@v0.3.8...v0.3.12

includes:

- darccio/mergo@c085d66 use src map if dst is nil and can't be set
    - fixes darccio/mergo#90 panic: reflect: reflect.Value.Set using unaddressable value merging nested structures

Signed-off-by: Jonathan Warriss-Simmons <misterws@diogenes.ws>
@codecov-commenter
Copy link

Codecov Report

Merging #3304 (221bf57) into master (e3023ca) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3304   +/-   ##
=======================================
  Coverage   57.99%   57.99%           
=======================================
  Files         302      302           
  Lines       21764    21764           
=======================================
  Hits        12621    12621           
  Misses       8219     8219           
  Partials      924      924           

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!


go 1.13

require gopkg.in/yaml.v2 v2.3.0
Copy link
Member

Choose a reason for hiding this comment

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

Was looking if we needed to update this one as well (currently we're using v2.2.8), but looks like the changes are not very relevant; go-yaml/yaml@v2.2.8...v2.3.0

@thaJeztah
Copy link
Member

@silvin-lubecki PTAL

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 f14d8e7 into docker:master Oct 1, 2021
@thaJeztah thaJeztah added this to the 21.xx milestone Oct 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants