Skip to content

[Backport release-1.18] Add support for async workflow activities#1102

Merged
sicoyle merged 1 commit into
release-1.18from
backport-1053-to-release-1.18
Jun 22, 2026
Merged

[Backport release-1.18] Add support for async workflow activities#1102
sicoyle merged 1 commit into
release-1.18from
backport-1053-to-release-1.18

Conversation

@dapr-bot

Copy link
Copy Markdown
Collaborator

Backport of #1053 to release-1.18.

Backporting failed due to merge conflicts. Please resolve manually:

git fetch origin
git checkout backport-1053-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 8367be531680bc5dbbdf1f537b277de899a02ed4

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

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

@sicoyle sicoyle requested review from a team as code owners June 22, 2026 14:55
@sicoyle sicoyle force-pushed the backport-1053-to-release-1.18 branch 2 times, most recently from dc3364d to db4b79c Compare June 22, 2026 15:07
Signed-off-by: Sergio Herrera <627709+seherv@users.noreply.github.com>
Signed-off-by: Samantha Coyle <sam@diagrid.io>
@sicoyle sicoyle force-pushed the backport-1053-to-release-1.18 branch from db4b79c to 19931b3 Compare June 22, 2026 15:22
@sicoyle sicoyle merged commit c1984a7 into release-1.18 Jun 22, 2026
17 checks passed
@sicoyle sicoyle deleted the backport-1053-to-release-1.18 branch June 22, 2026 16:29
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.

3 participants