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

[BACKPORT] 1.15.x manual backport of OSS->CE branch #18552

Merged
merged 1 commit into from
Aug 23, 2023
Merged

[BACKPORT] 1.15.x manual backport of OSS->CE branch #18552

merged 1 commit into from
Aug 23, 2023

Conversation

analogue
Copy link
Collaborator

Description

This is a manual backport for #18517.
The failed automated backport is #18547 and will be closed when this PR is approved.

@analogue analogue added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport labels Aug 22, 2023
@github-actions github-actions bot added theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies type/ci Relating to continuous integration (CI) tooling for testing or releases theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics labels Aug 22, 2023
@analogue analogue marked this pull request as ready for review August 22, 2023 20:27
@analogue analogue requested a review from a team as a code owner August 22, 2023 20:27
@analogue analogue requested a review from a team August 22, 2023 20:27
@analogue analogue requested a review from a team as a code owner August 22, 2023 20:27
@analogue analogue requested review from modrake and alvin-huang and removed request for a team August 22, 2023 20:27
@analogue
Copy link
Collaborator Author

"Vercel – consul-ui-staging — Deployment has failed" is just for an old version of node.js which is unrelated.

dhiaayachi
dhiaayachi approved these changes Aug 23, 2023
View reviewed changes
Copy link
Collaborator

@dhiaayachi dhiaayachi left a comment

Choose a reason for hiding this comment

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

I tried grepping for OSS to see if we missed any obvious spot and it look good to me

@analogue analogue merged commit 83a2e72 into release/1.15.x Aug 23, 2023
91 of 92 checks passed
@analogue analogue deleted the spatel/backport-1.15.x-oss-to-ce branch August 23, 2023 16:55
@analogue analogue mentioned this pull request Aug 23, 2023
Closed
4 tasks
@jira jira bot mentioned this pull request Aug 28, 2023
Closed
@jira jira bot mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhiaayachi dhiaayachi dhiaayachi approved these changes

@modrake modrake Awaiting requested review from modrake

@alvin-huang alvin-huang Awaiting requested review from alvin-huang

Assignees
No one assigned
Labels
pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry theme/acls ACL and token generation theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/ui Anything related to the UI type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@analogue @dhiaayachi