Skip to content

[18.09] backport LCOW: --platform on import (already in API)#1375

Merged
silvin-lubecki merged 1 commit intodocker:18.09from
thaJeztah:18.09_backport_importlcow
Sep 14, 2018
Merged

[18.09] backport LCOW: --platform on import (already in API)#1375
silvin-lubecki merged 1 commit intodocker:18.09from
thaJeztah:18.09_backport_importlcow

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Although LCOW is still experimental, this patch was fairly trivial, so I think it'd be ok to backport (but open to input)

This backports #1371 to the 18.09 branch

git checkout -b 18.09_backport_importlcow upstream/18.09   
git cherry-pick -s -S -x b55a0b681fb9592da0de4b770b682d1493c73038 

cherry-pick was clean; no conflicts

Signed-off-by: John Howard <[email protected]>
(cherry picked from commit b55a0b6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @simonferquel @jhowardmsft @chris-crone PTAL

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #1375 into 18.09 will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##            18.09    #1375      +/-   ##
==========================================
+ Coverage   54.55%   54.56%   +<.01%     
==========================================
  Files         294      294              
  Lines       19401    19403       +2     
==========================================
+ Hits        10585    10587       +2     
  Misses       8152     8152              
  Partials      664      664

Copy link
Copy Markdown
Collaborator

@vdemeester vdemeester 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
Copy Markdown
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 78c42cf into docker:18.09 Sep 14, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_importlcow branch September 14, 2018 13:27
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.

5 participants