Skip to content

[cherry-pick release/1.2] metadata: merge snapshot labels with metadata's labels#3437

Merged
crosbymichael merged 1 commit intocontainerd:release/1.2from
fuweid:cb-3025
Jul 22, 2019
Merged

[cherry-pick release/1.2] metadata: merge snapshot labels with metadata's labels#3437
crosbymichael merged 1 commit intocontainerd:release/1.2from
fuweid:cb-3025

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Jul 22, 2019

fix the no-op issue.

Signed-off-by: Wei Fu [email protected]
(cherry picked from commit 4b3e0a8)
Signed-off-by: Wei Fu [email protected]

cherry-pick: #3025

fix the no-op issue.

Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 4b3e0a8)
Signed-off-by: Wei Fu <[email protected]>
@fuweid
Copy link
Copy Markdown
Member Author

fuweid commented Jul 22, 2019

cc @wangpeng168

@fuweid fuweid changed the title metadata: merge snapshot labels with metadata's labels [cherry-pick release/1.2] metadata: merge snapshot labels with metadata's labels Jul 22, 2019
@codecov-io
Copy link
Copy Markdown

codecov-io commented Jul 22, 2019

Codecov Report

Merging #3437 into release/1.2 will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3437   +/-   ##
============================================
  Coverage        43.66%   43.66%           
============================================
  Files              101      101           
  Lines            10816    10816           
============================================
  Hits              4723     4723           
  Misses            5357     5357           
  Partials           736      736
Flag Coverage Δ
#linux 47.25% <0%> (ø) ⬆️
#windows 40.78% <0%> (ø) ⬆️
Impacted Files Coverage Δ
metadata/snapshot.go 45.8% <0%> (ø) ⬆️

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 4579a89...c8bbceb. 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

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit becb04a into containerd:release/1.2 Jul 22, 2019
@fuweid fuweid deleted the cb-3025 branch July 23, 2019 02:19
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