Skip to content

[release/1.3] cherry-pick: Fix image usage calculation error#4276

Merged
fuweid merged 1 commit intocontainerd:release/1.3from
estesp:cp-usage-fix
May 27, 2020
Merged

[release/1.3] cherry-pick: Fix image usage calculation error#4276
fuweid merged 1 commit intocontainerd:release/1.3from
estesp:cp-usage-fix

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented May 20, 2020

Cherry-picked 0c9b05f from #4275 for release/1.3

Including snapshotter usage in total calculation should be gated by the
option snapshotter boolean.

Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented May 20, 2020

Build succeeded.

Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented May 21, 2020

rerun the testing

@estesp
Copy link
Copy Markdown
Member Author

estesp commented May 21, 2020

this branch needs the updated golangci-lint to make CI work again; will be fixed in #4280

Including snapshotter usage in total calculation should be gated by the
option `snapshotter` boolean.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
@estesp
Copy link
Copy Markdown
Member Author

estesp commented May 22, 2020

AppVeyor build completed/passed...just as GH has a short outage and wasn't updating PRs: https://ci.appveyor.com/project/mlaventure/containerd-3g73f/builds/33056132

@containerd containerd deleted a comment from theopenlab-ci bot May 22, 2020
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan 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
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

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