Skip to content

[release/1.0] linux: fix runtime-root propagation#2194

Merged
crosbymichael merged 2 commits intocontainerd:release/1.0from
kunalkushwaha:cherry-pick-runtime-root
Mar 9, 2018
Merged

[release/1.0] linux: fix runtime-root propagation#2194
crosbymichael merged 2 commits intocontainerd:release/1.0from
kunalkushwaha:cherry-pick-runtime-root

Conversation

@kunalkushwaha
Copy link
Copy Markdown
Contributor

@kunalkushwaha kunalkushwaha commented Mar 8, 2018

Kunal Kushwaha [email protected]

Cherry-pick #2173 #2182

@AkihiroSuda AkihiroSuda changed the title Cherry pick --runtime-root to shim [release/1.0] linux: fix runtime-root propagation Mar 8, 2018
Comment thread daemon_config_linux_test.go Outdated
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.

CI failure is due to this unneeded nolint.
Could you remove this nolint from this PR (and also for master)?

@kunalkushwaha kunalkushwaha force-pushed the cherry-pick-runtime-root branch from e36d4e5 to 1549d92 Compare March 8, 2018 09:09
@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 8, 2018

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2194   +/-   ##
============================================
  Coverage        50.57%   50.57%           
============================================
  Files               81       81           
  Lines             7171     7171           
============================================
  Hits              3627     3627           
  Misses            2849     2849           
  Partials           695      695
Flag Coverage Δ
#linux 50.57% <ø> (ø) ⬆️

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 9b4bbcc...ee089eb. Read the comment docs.

Comment thread linux/runtime.go Outdated
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.

Please keep this log

@kunalkushwaha kunalkushwaha force-pushed the cherry-pick-runtime-root branch from 1549d92 to ee089eb Compare March 9, 2018 00:50
faf2781 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Kunal Kushwaha <[email protected]>
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 d2c460c into containerd:release/1.0 Mar 9, 2018
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.

5 participants