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

v1.16: tools: add Google Pub/Sub (backport of #211) #213

Merged
merged 1 commit into from
Oct 19, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 19, 2023

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

On branch mergify/bp/v1.16/pr-211
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit d8f4f38.
  (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:   README.md
	new file:   yellowstone-grpc-tools/config-google-pubsub.json
	new file:   yellowstone-grpc-tools/src/bin/grpc-google-pubsub.rs
	modified:   yellowstone-grpc-tools/src/bin/grpc-kafka.rs
	new file:   yellowstone-grpc-tools/src/config.rs
	new file:   yellowstone-grpc-tools/src/google_pubsub/config.rs
	new file:   yellowstone-grpc-tools/src/google_pubsub/mod.rs
	new file:   yellowstone-grpc-tools/src/google_pubsub/prom.rs
	modified:   yellowstone-grpc-tools/src/kafka/config.rs
	modified:   yellowstone-grpc-tools/src/kafka/prom.rs
	modified:   yellowstone-grpc-tools/src/lib.rs
	modified:   yellowstone-grpc-tools/src/prom.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   yellowstone-grpc-tools/Cargo.toml

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

@mergify mergify bot added the conflicts label Oct 19, 2023
Signed-off-by: Kirill Fomichev <[email protected]>
(cherry picked from commit d8f4f38)
@fanatid fanatid force-pushed the mergify/bp/v1.16/pr-211 branch from bda1143 to 77fe34b Compare October 19, 2023 14:51
@fanatid fanatid merged commit fdd3bcb into v1.16 Oct 19, 2023
3 checks passed
@fanatid fanatid deleted the mergify/bp/v1.16/pr-211 branch October 19, 2023 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant