Skip to content

[Backport release-1.18] sec: bump grpc dep - #4477

Open
dapr-bot wants to merge 1 commit into
release-1.18from
backport-4466-to-release-1.18
Open

[Backport release-1.18] sec: bump grpc dep#4477
dapr-bot wants to merge 1 commit into
release-1.18from
backport-4466-to-release-1.18

Conversation

@dapr-bot

Copy link
Copy Markdown
Collaborator

Backport of #4466 to release-1.18.

Backporting failed due to merge conflicts. Please resolve manually:

git fetch origin
git checkout backport-4466-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 9d78302c02a58abd4b299d9595de7aa8d29bc8ab

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

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

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.

1 participant