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.

Sign up for GitHub

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

Jump to bottom

Fix nolintlint #5272

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Fix nolintlint #5272

merged 1 commit into from
Nov 18, 2024
+2 −2

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Nov 18, 2024

Description

Semantic merge conflict between:

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123
Fix nolintlint
6ca3fa5 
Semantic merge conflict ...

See: 9267e87 ("Enable nolintlint linter")
See: 4280a0d ("Enable unparam linter")
Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 added the chore label Nov 18, 2024
@twz123 twz123 requested review from a team as code owners November 18, 2024 13:35
@twz123 twz123 requested review from ncopa and makhov November 18, 2024 13:35
juanluisvaladas
juanluisvaladas approved these changes Nov 18, 2024
View reviewed changes
Copy link
Contributor

@juanluisvaladas juanluisvaladas left a comment

Choose a reason for hiding this comment

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

Thanks for fixing it, I just noticed this in #5095

@twz123 twz123 merged commit 5d4c44c into k0sproject:main Nov 18, 2024
91 checks passed
@twz123 twz123 deleted the fix-nolintlint branch November 18, 2024 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juanluisvaladas juanluisvaladas juanluisvaladas approved these changes

@ncopa ncopa Awaiting requested review from ncopa ncopa is a code owner automatically assigned from k0sproject/k0s-maintainers

@makhov makhov Awaiting requested review from makhov makhov is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
chore
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@twz123 @juanluisvaladas