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: fix memory-swap flag not validate correct #1614

Merged
merged 1 commit into from
Jul 3, 2018
Merged

bugfix: fix memory-swap flag not validate correct #1614

merged 1 commit into from
Jul 3, 2018

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented Jul 2, 2018

amendContainerSettings should before validateConfig

Signed-off-by: Ace-Tang aceapril@126.com

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

amendContainerSettings should before validateConfig

Signed-off-by: Ace-Tang <aceapril@126.com>
@Ace-Tang Ace-Tang requested a review from Letty5411 July 2, 2018 03:27
@Letty5411
Copy link
Contributor

LGTM

@codecov-io
Copy link

Codecov Report

Merging #1614 into master will decrease coverage by 2.92%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1614      +/-   ##
==========================================
- Coverage   41.95%   39.03%   -2.93%     
==========================================
  Files         270      273       +3     
  Lines       17585    18906    +1321     
==========================================
+ Hits         7378     7380       +2     
- Misses       9298    10609    +1311     
- Partials      909      917       +8
Impacted Files Coverage Δ
daemon/mgr/container.go 35.53% <100%> (-14.66%) ⬇️
apis/opts/config/blkio.go 0% <0%> (-69.67%) ⬇️
pkg/utils/filters/filter.go 22.5% <0%> (-45%) ⬇️
apis/server/container_bridge.go 57.71% <0%> (-24.31%) ⬇️
daemon/mgr/network.go 48.7% <0%> (-19.45%) ⬇️
daemon/mgr/container_types.go 62.13% <0%> (-13.99%) ⬇️
apis/server/image_bridge.go 53.06% <0%> (-12.77%) ⬇️
daemon/mgr/container_state.go 78.84% <0%> (-8.39%) ⬇️
apis/opts/config/runtime.go 58.33% <0%> (-8.34%) ⬇️
... and 10 more

@allencloud allencloud merged commit 7caca29 into AliyunContainerService:master Jul 3, 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.

4 participants