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

chore: audit store/streaming/file/service.go (backport #14234) #14242

Merged
merged 2 commits into from
Dec 10, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 10, 2022

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

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

You are currently cherry-picking commit ae2c762bd.
  (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)

Changes to be committed:
	modified:   server/config/config.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   server/config/toml.go
	both modified:   store/streaming/file/service.go
	both modified:   store/streaming/file/service_test.go
	both modified:   store/types/listening.go

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 ae2c762)

# Conflicts:
#	server/config/toml.go
#	store/streaming/file/service.go
#	store/streaming/file/service_test.go
#	store/types/listening.go
@mergify mergify bot added the conflicts label Dec 10, 2022
@tac0turtle tac0turtle merged commit c0d85e3 into release/v0.45.x Dec 10, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-14234 branch December 10, 2022 18:30
@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
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.

3 participants