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 of Fix segments fragments loss into release/1.14.x #23841

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Backport of Fix segments fragments loss into release/1.14.x #23841

merged 1 commit into from
Oct 25, 2023

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

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

🚨

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:
@akshya96
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/vault/merges: 409 Merge conflict []

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

Approved ent pr: https://github.com/hashicorp/vault-enterprise/pull/4858

Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/vault-21179-oss/presumably-pleasant-gazelle branch from 9b339db to c07fb7e Compare October 25, 2023 21:27
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 25, 2023 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Oct 25, 2023
@akshya96
Fix segments fragments loss (#23781)
e909258 
* add ent changes

* add changelog

* make fmt
@akshya96 akshya96 force-pushed the backport/vault-21179-oss/presumably-pleasant-gazelle branch from ecb7523 to e909258 Compare October 25, 2023 21:35
@akshya96 akshya96 marked this pull request as ready for review October 25, 2023 21:35
@akshya96 akshya96 added this to the 1.14.6 milestone Oct 25, 2023
@akshya96 akshya96 enabled auto-merge (squash) October 25, 2023 21:39
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@akshya96 akshya96 merged commit 725de7b into release/1.14.x Oct 25, 2023
@akshya96 akshya96 deleted the backport/vault-21179-oss/presumably-pleasant-gazelle branch October 25, 2023 21:55
@github-actions
Copy link

CI Results:
All Go tests succeeded! ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akshya96 akshya96 akshya96 approved these changes

Assignees
No one assigned
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Milestone
1.14.6
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-secure-vault-core @hashicorp-cla @akshya96