Skip to content

[BACKPORT] 1.16.x manual backport of OSS->CE branch#18549

Merged
analogue merged 7 commits intorelease/1.16.xfrom
spatel/backport-1.16.x-oss-to-ce
Aug 23, 2023
Merged

[BACKPORT] 1.16.x manual backport of OSS->CE branch#18549
analogue merged 7 commits intorelease/1.16.xfrom
spatel/backport-1.16.x-oss-to-ce

Conversation

@analogue
Copy link
Contributor

@analogue analogue commented Aug 22, 2023

Description

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

@analogue analogue requested a review from a team as a code owner August 22, 2023 16:32
@analogue analogue requested a review from a team August 22, 2023 16:32
@analogue analogue requested a review from a team as a code owner August 22, 2023 16:32
@analogue analogue requested review from dekimsey and emilymianeil and removed request for a team August 22, 2023 16:32
@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 pr/no-backport labels Aug 22, 2023
@analogue analogue requested review from dhiaayachi and rboyer August 22, 2023 16:48
dhiaayachi
dhiaayachi approved these changes Aug 23, 2023
View reviewed changes
Copy link
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 7c72bba into release/1.16.x Aug 23, 2023
@analogue analogue deleted the spatel/backport-1.16.x-oss-to-ce branch August 23, 2023 16:53
@analogue analogue mentioned this pull request Aug 23, 2023
Closed
4 tasks
asheshvidyut pushed a commit that referenced this pull request Sep 4, 2023
@hc-github-team-consul-core @im2nguyen
Backport of CI Split integration tests to run nightly and every PR in…
3cf0607 
…to release/1.16.x (#18520)

resolve conflict

Co-authored-by: temp <temp@hashicorp.com>

Backport of bug: prevent go routine leakage due to existing DeferCheck into release/1.16.x (#18565)

* backport of commit 06d4c72

* backport of commit 42c37bb

---------

Co-authored-by: cskh <hui.kang@hashicorp.com>

fix for , non presence of consul-version meta (#18464) (#18561)

* fix for #18406 , non presence of consul-version meta

Co-authored-by: Vijay <vijayraghav22@gmail.com>

[BACKPORT] 1.16.x manual backport of OSS->CE branch (#18549)

Backport of NET-5382 & PLAT-1159: Do not trigger workflow if only doc files are in commit history into release/1.16.x (#18570)

backport of commit c833fcc

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>

Backport of docs: Fix spelling errors across various pages on the site into release/1.16.x (#18537)

docs: Fix spelling errors across various pages on the site (#18533)

This commit fixes numerous spelling errors across the site and also
removes unnecessary whitespace that was present in the edited files.

Co-authored-by: Blake Covarrubias <blake@covarrubi.as>

Backport of Fix broken link on sameness group page into release/1.16.x (#18588)

backport of commit 05dd1a8

Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dekimsey dekimsey Awaiting requested review from dekimsey

@emilymianeil emilymianeil Awaiting requested review from emilymianeil

@rboyer rboyer Awaiting requested review from rboyer

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 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