Skip to content

[Backport release-1.18] GRPC Actors#1143

Merged
acroca merged 1 commit into
release-1.18from
backport-1081-to-release-1.18
Jul 13, 2026
Merged

[Backport release-1.18] GRPC Actors#1143
acroca merged 1 commit into
release-1.18from
backport-1081-to-release-1.18

Conversation

@dapr-bot

Copy link
Copy Markdown
Collaborator

Backport of #1081 to release-1.18.

Backporting failed due to merge conflicts. Please resolve manually:

git fetch origin
git checkout backport-1081-to-release-1.18

# Reset to base, discarding the empty placeholder commit
git reset --hard origin/release-1.18

# Cherry-pick the merged commit
git cherry-pick -x -m 1 64c75a1b5cba6f58a6ec55fb8b6acb7a29007c83

# Resolve the conflicts, then:
git add .
git cherry-pick --continue

# Force-push to replace the placeholder commit
git push --force-with-lease origin backport-1081-to-release-1.18

* GRPC Actors

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Potential fix for pull request finding

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Addressed PR comments

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Addressed PR comments

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Address review comments

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Changes from review

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Changes from review

Signed-off-by: Albert Callarisa <albert@diagrid.io>

* Review comments

Signed-off-by: Albert Callarisa <albert@diagrid.io>

---------

Signed-off-by: Albert Callarisa <albert@diagrid.io>
Co-authored-by: Sam <sam@diagrid.io>
(cherry picked from commit 64c75a1)
@acroca acroca force-pushed the backport-1081-to-release-1.18 branch from 0ff4d14 to 82d4501 Compare July 13, 2026 08:18
@acroca acroca requested review from a team as code owners July 13, 2026 08:18
@acroca acroca merged commit 1b5c13d into release-1.18 Jul 13, 2026
16 of 17 checks passed
@dapr-bot dapr-bot deleted the backport-1081-to-release-1.18 branch July 13, 2026 08:37
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.

2 participants