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

server: fix spurious blocking query suppression for discovery chains #12512

Merged
merged 2 commits into from Mar 3, 2022
Merged

server: fix spurious blocking query suppression for discovery chains #12512

merged 2 commits into from Mar 3, 2022

Conversation

rboyer
Copy link
Member

@rboyer rboyer commented Mar 3, 2022 •
edited

Minor fix for behavior in #12362

IsDefault sometimes returns true even if there was a proxy-defaults or service-defaults config entry that was consulted. This PR fixes that.

@rboyer rboyer requested a review from a team March 3, 2022 17:50
@rboyer rboyer self-assigned this Mar 3, 2022
@vercel vercel bot temporarily deployed to Preview – consul March 3, 2022 17:52 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging March 3, 2022 17:52 Inactive
markan
markan approved these changes Mar 3, 2022
View reviewed changes
Copy link
Contributor

@markan markan left a comment

Choose a reason for hiding this comment

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

LGTM.

@rboyer rboyer merged commit 9268715 into main Mar 3, 2022
@rboyer rboyer deleted the fix-disco-chain-not-found branch March 3, 2022 22:54
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/602308.

@hc-github-team-consul-core
Copy link
Collaborator

🍒✅ Cherry pick of commit 9268715 onto release/1.11.x succeeded!

hc-github-team-consul-core pushed a commit that referenced this pull request Mar 3, 2022
@rboyer @hc-github-team-consul-core
server: fix spurious blocking query suppression for discovery chains (#…
6a93143 
…12512)

Minor fix for behavior in #12362

IsDefault sometimes returns true even if there was a proxy-defaults or service-defaults config entry that was consulted. This PR fixes that.
@hc-github-team-consul-core
Copy link
Collaborator

🍒✅ Cherry pick of commit 9268715 onto release/1.10.x succeeded!

hc-github-team-consul-core pushed a commit that referenced this pull request Mar 3, 2022
@rboyer @hc-github-team-consul-core
server: fix spurious blocking query suppression for discovery chains (#…
29c98e2 
…12512)

Minor fix for behavior in #12362

IsDefault sometimes returns true even if there was a proxy-defaults or service-defaults config entry that was consulted. This PR fixes that.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markan markan markan approved these changes

@kisunji kisunji kisunji approved these changes

Assignees

@rboyer rboyer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rboyer @hc-github-team-consul-core @markan @kisunji