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

install: Fix erroneous comment #11603

Merged
merged 1 commit into from May 25, 2020

Conversation

joestringer
Copy link
Member

This comment implies that portmap is enabled, but the check immediately
above also covers the case where there is no chaining mode. Remove the
invalid comment.

@joestringer joestringer added release-note/misc This PR makes changes that have no direct user impact. needs-backport/1.7 labels May 19, 2020
@joestringer joestringer requested a review from a team as a code owner May 19, 2020 19:44
@joestringer joestringer requested a review from a team May 19, 2020 19:44
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 May 19, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.5 May 19, 2020
@joestringer joestringer force-pushed the submit/fix-configmap-comment branch from b3b1fc9 to ce867b2 Compare May 19, 2020 19:45
@christarazi christarazi added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label May 21, 2020
This comment implies that portmap is enabled, but the check immediately
above also covers the case where there is no chaining mode. Remove the
invalid comment.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer force-pushed the submit/fix-configmap-comment branch from ce867b2 to ca96471 Compare May 21, 2020 22:21
@joestringer joestringer removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label May 21, 2020
@joestringer
Copy link
Member Author

retest-4.9

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.006%) to 36.866% when pulling ca96471 on joestringer:submit/fix-configmap-comment into 054dd16 on cilium:master.

@aanm aanm merged commit 3a71d58 into cilium:master May 25, 2020
1.8.0 automation moved this from In progress to Merged May 25, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.5 Jun 3, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.5 Jun 3, 2020
@joestringer joestringer moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.5 Jun 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.7.5
Backport done to v1.7
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

None yet

5 participants