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

Backport of test: fix snapshot save w/ append test for ENT into release/1.16.x #18659

Conversation

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

Backport

This PR is auto-generated from #18656 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@DanStough
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

Small fix for this test. This fails in ENT because the version has 1.17.0+ent, but the test agent version does not have the +ent suffix.

The original PR is #18625


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Sep 1, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 1, 2023 22:25 Inactive
@absolutelightning absolutelightning requested review from absolutelightning and removed request for DanStough September 4, 2023 07:34
@absolutelightning absolutelightning marked this pull request as ready for review September 4, 2023 07:35
…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>
@DanStough
Copy link
Contributor

@absolutelightning were these changes not needed on the backport branches, or did they get included elsewhere?

@absolutelightning
Copy link
Contributor

@absolutelightning were these changes not needed on the backport branches, or did they get included elsewhere?

included elsewhere

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants