Skip to content

[BACKPORT] 1.14.x manual backport of OSS->CE branch#18556

Merged
analogue merged 2 commits into
release/1.14.xfrom
spatel/backport-1.14.x-oss-to-ce
Aug 23, 2023
Merged

[BACKPORT] 1.14.x manual backport of OSS->CE branch#18556
analogue merged 2 commits into
release/1.14.xfrom
spatel/backport-1.14.x-oss-to-ce

Conversation

@analogue
Copy link
Copy Markdown
Contributor

@analogue analogue commented Aug 22, 2023

Description

This is a manual backport for #18517.
The the automated backport failed creation so nothing to reference here.

@analogue analogue requested a review from a team as a code owner August 22, 2023 20:38
@analogue analogue requested a review from a team August 22, 2023 20:38
@analogue analogue requested a review from a team as a code owner August 22, 2023 20:38
@analogue analogue requested review from claire-labry, dhiaayachi and sarahethompson and removed request for a team August 22, 2023 20:38
@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 added pr/no-changelog PR does not need a corresponding .changelog entry and removed 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
dhiaayachi
dhiaayachi approved these changes Aug 23, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@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 3c937f3 into release/1.14.x Aug 23, 2023
@analogue analogue deleted the spatel/backport-1.14.x-oss-to-ce branch August 23, 2023 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sarahethompson sarahethompson Awaiting requested review from sarahethompson

@claire-labry claire-labry Awaiting requested review from claire-labry

1 more reviewer

@dhiaayachi dhiaayachi dhiaayachi approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@analogue @dhiaayachi