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

v1.6 backports 2019-12-12 #9753

Merged
merged 1 commit into from Jan 6, 2020
Merged

v1.6 backports 2019-12-12 #9753

merged 1 commit into from Jan 6, 2020

Conversation

jrajahalme
Copy link
Member

@jrajahalme jrajahalme commented Dec 12, 2019

Once this PR is merged, you can update the PR labels via:

$ for pr in 9643 9743; do contrib/backporting/set-labels.py $pr done 1.6; done

This change is Reviewable

@jrajahalme jrajahalme requested a review from a team as a code owner December 12, 2019 16:23
@github-actions github-actions bot added the kind/backports This PR provides functionality previously merged into master. label Dec 12, 2019
@jrajahalme
Copy link
Member Author

never-tell-me-the-odds

@github-actions github-actions bot added this to In progress in 1.6.5 Dec 12, 2019
@joestringer joestringer removed this from In progress in 1.6.5 Dec 17, 2019
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

Can you drop the FQDN commit so we can fix the documentation parts?

@raybejjani
Copy link
Contributor

@jrajahalme I finally managed to understand what's going on. The version of viper we have on master and 1.6 happen to have a bug were IsSet always returns true. This seems to cause IPs to not show up in the checks for the failing tests. Given that the original motivation for backporting this was to supports the --tofqdns-min-ttl 0 usecase, but it turned out to not be in-use, I'd say let's skip the backport for now. It isn't critical for any known user (and otherwise unlikely to occur).
See #9796 for the fix on master.

[ upstream commit b5c1cbd ]

Signed-off-by: Vlad Ungureanu <vladu@palantir.com>
@jrajahalme
Copy link
Member Author

Dropped #9743

@jrajahalme
Copy link
Member Author

never-tell-me-the-odds

@aanm aanm merged commit 59accfd into v1.6 Jan 6, 2020
@aanm aanm deleted the pr/v1.6-backports-2019-12-12 branch January 6, 2020 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
No open projects
1.6.6
Awaiting triage
Development

Successfully merging this pull request may close these issues.

None yet

4 participants