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

fix(store): Fix the TestFileStreamingService unit test. (backport #14305) #14309

Merged
merged 2 commits into from
Dec 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2022

This is an automatic backport of pull request #14305 done by Mergify.
Cherry-pick of aba4e6e has failed:

On branch mergify/bp/release/v0.46.x/pr-14305
Your branch is up to date with 'origin/release/v0.46.x'.

You are currently cherry-picking commit aba4e6efb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   store/streaming/file/service_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit aba4e6e)

# Conflicts:
#	store/streaming/file/service_test.go
@mergify mergify bot requested a review from a team as a code owner December 14, 2022 22:18
@mergify mergify bot added the conflicts label Dec 14, 2022
@julienrbrt julienrbrt enabled auto-merge (squash) December 14, 2022 22:26
@julienrbrt julienrbrt merged commit 9122aad into release/v0.46.x Dec 14, 2022
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.46.x/pr-14305 branch December 14, 2022 22:39
ryanchristo pushed a commit to regen-network/cosmos-sdk that referenced this pull request Dec 15, 2022
…mos#14305) (cosmos#14309)

Co-authored-by: Daniel Wedul <github@wedul.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants