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: kafka: rename to tools (backport of #203) #209

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 17, 2023

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

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

You are currently cherry-picking commit f5f0c3c.
  (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:   .github/workflows/test.yml
	modified:   README.md
	deleted:    yellowstone-grpc-kafka/Cargo.toml
	deleted:    yellowstone-grpc-kafka/src/prom.rs
	renamed:    yellowstone-grpc-kafka/build.rs -> yellowstone-grpc-tools/build.rs
	renamed:    yellowstone-grpc-kafka/config.json -> yellowstone-grpc-tools/config-kafka.json
	renamed:    yellowstone-grpc-kafka/docker-kafka.yml -> yellowstone-grpc-tools/docker-kafka.yml
	renamed:    yellowstone-grpc-kafka/src/bin/grpc-kafka.rs -> yellowstone-grpc-tools/src/bin/grpc-kafka.rs
	renamed:    yellowstone-grpc-kafka/src/config.rs -> yellowstone-grpc-tools/src/kafka/config.rs
	renamed:    yellowstone-grpc-kafka/src/dedup.rs -> yellowstone-grpc-tools/src/kafka/dedup.rs
	renamed:    yellowstone-grpc-kafka/src/grpc.rs -> yellowstone-grpc-tools/src/kafka/grpc.rs
	new file:   yellowstone-grpc-tools/src/kafka/mod.rs
	new file:   yellowstone-grpc-tools/src/kafka/prom.rs
	renamed:    yellowstone-grpc-kafka/src/lib.rs -> yellowstone-grpc-tools/src/lib.rs
	new file:   yellowstone-grpc-tools/src/prom.rs
	renamed:    yellowstone-grpc-kafka/src/version.rs -> yellowstone-grpc-tools/src/version.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/release.yml
	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 17, 2023
(cherry picked from commit f5f0c3c)
@fanatid fanatid force-pushed the mergify/bp/v1.16/pr-203 branch from 9693b5f to 326da16 Compare October 17, 2023 09:50
@fanatid fanatid merged commit e431248 into v1.16 Oct 17, 2023
3 checks passed
@fanatid fanatid deleted the mergify/bp/v1.16/pr-203 branch October 17, 2023 12:43
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