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

[1.10.x] server: suppress spurious blocking query returns where multiple config entries are involved #12459

Merged
merged 2 commits into from
Feb 25, 2022

Conversation

rboyer
Copy link
Member

@rboyer rboyer commented Feb 25, 2022

Backport of #12362 to 1.10.x

Conflicts:

  • agent/consul/config_endpoint.go
  • agent/consul/discovery_chain_endpoint_test.go
  • agent/consul/intention_endpoint_test.go
  • agent/consul/internal_endpoint.go
  • agent/consul/internal_endpoint_test.go
  • agent/consul/rpc.go

…ple config entries are involved

Backport of #12362 to 1.10.x

Conflicts:
- agent/consul/config_endpoint.go
- agent/consul/discovery_chain_endpoint_test.go
- agent/consul/intention_endpoint_test.go
- agent/consul/internal_endpoint.go
- agent/consul/internal_endpoint_test.go
- agent/consul/rpc.go
@rboyer rboyer added the pr/no-changelog PR does not need a corresponding .changelog entry label Feb 25, 2022
@rboyer rboyer requested review from kisunji and a team February 25, 2022 22:27
@rboyer rboyer self-assigned this Feb 25, 2022
@github-actions github-actions bot added the pr/dependencies PR specifically updates dependencies of project label Feb 25, 2022
@vercel vercel bot temporarily deployed to Preview – consul February 25, 2022 22:28 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging February 25, 2022 22:28 Inactive
@rboyer rboyer merged commit 9194e15 into release/1.10.x Feb 25, 2022
@rboyer rboyer deleted the 1-10-x-more-blocking-queries-not-found branch February 25, 2022 22:45
@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/597853.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/dependencies PR specifically updates dependencies of project pr/no-changelog PR does not need a corresponding .changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants