Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: compability with alidocker when update container diskquota #1264

Merged

Conversation

HusterWan
Copy link
Contributor

Signed-off-by: Michael Wan [email protected]

Ⅰ. Describe what this PR did

alidocker use Labels["DiskQuota"] to record container diskquota, so when update diskquota, we also need to update the value of Labels["DiskQuota"]

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/S labels May 2, 2018
@HusterWan HusterWan force-pushed the zr/fix-open-file-err branch from 227fb8b to 192e778 Compare May 2, 2018 11:56
@codecov-io
Copy link

codecov-io commented May 2, 2018

Codecov Report

Merging #1264 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1264      +/-   ##
==========================================
- Coverage   15.26%   15.25%   -0.01%     
==========================================
  Files         172      172              
  Lines       10699    10702       +3     
==========================================
  Hits         1633     1633              
- Misses       8946     8949       +3     
  Partials      120      120
Impacted Files Coverage Δ
daemon/mgr/container.go 0% <0%> (ø) ⬆️

@fuweid
Copy link
Contributor

fuweid commented May 2, 2018

LGTM

@fuweid fuweid merged commit 765a4a2 into AliyunContainerService:master May 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants