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 flags name should be same #1138

Merged
merged 1 commit into from
Apr 20, 2018
Merged

bugfix: fix flags name should be same #1138

merged 1 commit into from
Apr 20, 2018

Conversation

Ace-Tang
Copy link
Contributor

flag name and json field in daemon file should be consistent,
cause we need check the valid and conflict in flags from two part.

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

Ⅰ. Describe what this PR did

flag name and json field in daemon file should be consistent,
cause we need check the valid and conflict in flags from two part.

for eg, this two part should have same name.

Labels []string `json:"label,omitempty"`

flagSet.StringSliceVar(&cfg.Labels, "label", []string{}, "Set metadata for Pouch daemon")

Ⅱ. 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/XS labels Apr 17, 2018
@Ace-Tang
Copy link
Contributor Author

this pr has conflict with #1132 , if one is merged, the other should be rebased.

@codecov-io
Copy link

codecov-io commented Apr 17, 2018

Codecov Report

Merging #1138 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1138   +/-   ##
=======================================
  Coverage   16.01%   16.01%           
=======================================
  Files         174      174           
  Lines       10042    10042           
=======================================
  Hits         1608     1608           
  Misses       8317     8317           
  Partials      117      117
Impacted Files Coverage Δ
daemon/config/config.go 10% <ø> (ø) ⬆️

@Ace-Tang
Copy link
Contributor Author

it can be merged, @allencloud ,PTAL

flag name and json field in daemon file should be consistent,
cause we need check the valid and conflict in flags from two part.

Signed-off-by: Ace-Tang <aceapril@126.com>
@HusterWan
Copy link
Contributor

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 20, 2018
@HusterWan HusterWan merged commit 16d5d09 into AliyunContainerService:master Apr 20, 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 LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants