Skip to content

[release/1.0] client/pull: fix label being put on snapshot instead of content#2240

Merged
stevvooe merged 1 commit intocontainerd:release/1.0from
dmcgowan:backport-fix-uncompressed-label
Mar 28, 2018
Merged

[release/1.0] client/pull: fix label being put on snapshot instead of content#2240
stevvooe merged 1 commit intocontainerd:release/1.0from
dmcgowan:backport-fix-uncompressed-label

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Backport #2237

The uncompressed label should be placed on content instead
of snapshots. Currently the uncompressed label is getting
passed into as a label option for apply, which is used to commit
snapshots. The content is already committed, but after apply
the uncompressed diff digest is verified and can be reliably used
to update the content with the label.

The uncompressed label should be placed on content instead
of snapshots. Currently the uncompressed label is getting
passed into as a label option for apply, which is used to commit
snapshots. The content is already committed, but after apply
the uncompressed diff digest is verified and can be reliably used
to update the content with the label.

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit d608e3d)
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan added this to the 1.0.3 milestone Mar 28, 2018
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2240 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2240   +/-   ##
============================================
  Coverage        50.78%   50.78%           
============================================
  Files               81       81           
  Lines             7176     7176           
============================================
  Hits              3644     3644           
  Misses            2832     2832           
  Partials           700      700
Flag Coverage Δ
#linux 50.78% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bde0036...457c658. Read the comment docs.

Copy link
Copy Markdown
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

@stevvooe
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe merged commit 386b4e9 into containerd:release/1.0 Mar 28, 2018
@dmcgowan dmcgowan deleted the backport-fix-uncompressed-label branch September 10, 2019 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants