Skip to content

vendor: github.com/docker/docker v26.0.0-rc1 - #4906

Merged
thaJeztah merged 1 commit into
docker:masterfrom
Benehiko:benehiko/v26.0.0-rc1
Mar 1, 2024
Merged

vendor: github.com/docker/docker v26.0.0-rc1#4906
thaJeztah merged 1 commit into
docker:masterfrom
Benehiko:benehiko/v26.0.0-rc1

Conversation

@Benehiko

@Benehiko Benehiko commented Mar 1, 2024

Copy link
Copy Markdown
Member

@codecov-commenter

codecov-commenter commented Mar 1, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.24%. Comparing base (9015b71) to head (5e80232).
Report is 647 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4906   +/-   ##
=======================================
  Coverage   61.23%   61.24%           
=======================================
  Files         287      287           
  Lines       20090    20090           
=======================================
+ Hits        12302    12304    +2     
+ Misses       6894     6893    -1     
+ Partials      894      893    -1     

@Benehiko Benehiko self-assigned this Mar 1, 2024
@Benehiko
Benehiko requested review from thaJeztah and vvoland March 1, 2024 15:52

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

changes LGTM

technically, the commits should probably be squashed, so that the local changes needed go hand-in-hand with the vendor changes that require it.

Let me know if you want to do the squashing (also happy to push to your branch)

full diff: moby/moby@c70d790...v26.0.0-rc1

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

test: update fixtures

Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
@Benehiko
Benehiko force-pushed the benehiko/v26.0.0-rc1 branch from ce22418 to 5e80232 Compare March 1, 2024 17:24
@Benehiko

Benehiko commented Mar 1, 2024

Copy link
Copy Markdown
Member Author

Should the commit message also be sanitized? I kept the previous commit messages when squashing

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

commit message looks fine for this one, no need to over complicate things for this.

Thanks!!

LGTM

@thaJeztah
thaJeztah merged commit 35e6a41 into docker:master Mar 1, 2024
@Benehiko
Benehiko deleted the benehiko/v26.0.0-rc1 branch March 1, 2024 17:34
@thaJeztah thaJeztah added this to the 26.0.0 milestone Sep 18, 2024
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.

4 participants