Skip to content

Db contrib/waltz 7457 proposed flow workflow enahancements#7464

Merged
jain-shreyans-db merged 7 commits intofinos:masterfrom
deutschebank:db-contrib/waltz-7457-proposed-flow-workflow-enahancements
Mar 9, 2026
Merged

Db contrib/waltz 7457 proposed flow workflow enahancements#7464
jain-shreyans-db merged 7 commits intofinos:masterfrom
deutschebank:db-contrib/waltz-7457-proposed-flow-workflow-enahancements

Conversation

@jain-shreyans-db
Copy link
Copy Markdown
Contributor

…flow actions"

This reverts commit bc39f56, reversing
changes made to 33e3169.
This reverts commit 39abf0d.
…lows - so that no two actions get applied simultaneously"

This reverts commit 17a3363, reversing
changes made to 5a06c59.

# Conflicts:
#	waltz-service/src/main/java/org/finos/waltz/service/proposed_flow_workflow/ProposedFlowWorkflowService.java
…ons for propose flow

Merge in WALTZ/waltz from WALTZ/waltz-sj:CTCTOWALTZ-5109-sync-simultaneous-actions-for-propose-flow to integration/maker-checker-workflow

* commit '9cc16ea4466c202e9de4d88437d97803de600fac':
  import set
  Revert "Pull request finos#689: use for update when users action on flows - so that no two actions get applied simultaneously"
  Revert "refactor"
  Revert "Pull request finos#695: CTCTOWALTZ-5244 sync of simultaneous flow actions"
Merge in WALTZ/waltz from integration/maker-checker-workflow to db-feature/waltz-7457-proposed-flow-workflow-enahancements

* commit '8f17a98b884dbd7a9952a1506dd0b1eae7c34274':
  import set
  Revert "Pull request finos#689: use for update when users action on flows - so that no two actions get applied simultaneously"
  Revert "refactor"
  Revert "Pull request finos#695: CTCTOWALTZ-5244 sync of simultaneous flow actions"
…altz/waltz into db-feature/waltz-7457-proposed-flow-workflow-enahancements
@jain-shreyans-db jain-shreyans-db merged commit ed66174 into finos:master Mar 9, 2026
4 of 5 checks passed
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