Skip to content

feat(server): start grpc server and register services in standalone mode (backport #18110)#18162

Closed
mergify[bot] wants to merge 1 commit into
release/v0.50.xfrom
mergify/bp/release/v0.50.x/pr-18110
Closed

feat(server): start grpc server and register services in standalone mode (backport #18110)#18162
mergify[bot] wants to merge 1 commit into
release/v0.50.xfrom
mergify/bp/release/v0.50.x/pr-18110

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 18, 2023

This is an automatic backport of pull request #18110 done by Mergify.
Cherry-pick of 31f5bc0 has failed:

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

You are currently cherry-picking commit 31f5bc07e.
  (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:   docs/docs/user/run-node/01-run-node.md
	modified:   server/start.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

…ode (#18110)

Co-authored-by: Marko <marko@baricevic.me>
(cherry picked from commit 31f5bc0)

# Conflicts:
#	CHANGELOG.md
@mergify mergify Bot requested a review from a team October 18, 2023 10:38
@mergify mergify Bot added the conflicts label Oct 18, 2023
@ghost ghost requested review from a team, alexanderbez and likhita-809 and removed request for a team October 18, 2023 10:38
Copy link
Copy Markdown
Contributor

@likhita-809 likhita-809 left a comment

Choose a reason for hiding this comment

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

hey @p-offtermatt, can you resolve the conflicts on this PR?
since its a backport of your #18110 PR

@p-offtermatt
Copy link
Copy Markdown
Contributor

I created a new PR for this (since lacking write access I cannot push directly to this PR)
#18163

@tac0turtle tac0turtle closed this Oct 18, 2023
@mergify mergify Bot deleted the mergify/bp/release/v0.50.x/pr-18110 branch October 18, 2023 11:42
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.

3 participants