Skip to content

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

Closed
hc-github-team-consul-core wants to merge 3 commits intorelease/1.15.xfrom
backport/dans/fix-snapshot-save-test/vaguely-solid-sheepdog
Closed

Backport of test: fix snapshot save w/ append test for ENT into release/1.15.x#18658
hc-github-team-consul-core wants to merge 3 commits intorelease/1.15.xfrom
backport/dans/fix-snapshot-save-test/vaguely-solid-sheepdog

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

🚨

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

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


2 out of 3 committers have signed the CLA.

  • absolutelightning
  • DanStough
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 1, 2023 22:22 Inactive
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 September 1, 2023 22:32 Inactive
@asheshvidyut asheshvidyut marked this pull request as ready for review September 4, 2023 07:30
@asheshvidyut asheshvidyut removed the request for review from DanStough September 4, 2023 07:31
@asheshvidyut asheshvidyut enabled auto-merge (squash) September 4, 2023 07:31
auto-merge was automatically disabled September 4, 2023 07:47

Pull request was closed

@github-actions github-actions bot deleted the backport/dans/fix-snapshot-save-test/vaguely-solid-sheepdog branch August 29, 2025 06:08
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