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

Store: fix merge race #7476

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Store: fix merge race #7476

merged 1 commit into from
Jun 22, 2024

Conversation

MichaHoffmann
Copy link
Contributor

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

The function used to be in the package but was moved concurrently to storetestutil. This PR fixes the build again.

Verification

@MichaHoffmann
Store: fix merge race
443671a 
Signed-off-by: Michael Hoffmann <[email protected]>
@saswatamcode saswatamcode enabled auto-merge (squash) June 21, 2024 16:34
@saswatamcode saswatamcode enabled auto-merge (squash) June 21, 2024 16:35
fpetkovski
fpetkovski approved these changes Jun 21, 2024
View reviewed changes
Copy link
Contributor

@fpetkovski fpetkovski left a comment

Choose a reason for hiding this comment

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

There's a setting in github that merging can only be allowed if the branch is rebased on main. We can consider it if this happens agian.

@MichaHoffmann MichaHoffmann merged commit 52975fc into main Jun 22, 2024
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpetkovski fpetkovski fpetkovski approved these changes

@saswatamcode saswatamcode saswatamcode approved these changes

Assignees
No one assigned
Labels
size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@MichaHoffmann @fpetkovski @saswatamcode