Skip to content

Actions: apache/cloudstack

Actions

PR Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-checker.yml
2,500+ workflow runs
2,500+ workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
Bump org.apache.kafka:kafka-clients from 2.7.0 to 3.9.2 PR Merge Conflict Check #17692: Pull request #13069 opened by dependabot Bot
4m 12s dependabot/maven/org.apache.kafka-kafka-clients-3.9.2
dependabot/maven/org.apache.kafka-kafka-clients-3.9.2
4m 12s
Bump org.apache.kafka:kafka-clients from 2.7.0 to 3.9.2 PR Merge Conflict Check #17691: Commit 35e82e5 pushed by dependabot Bot
7s dependabot/maven/org.apache.kafka-kafka-clients-3.9.2
dependabot/maven/org.apache.kafka-kafka-clients-3.9.2
7s
CloudStack Volume support with ONTAP storage PR Merge Conflict Check #17690: Pull request #13053 synchronize by rajiv-jain-netapp
Action required NetApp:sync/apache-main-apr-2026
NetApp:sync/apache-main-apr-2026
Action required
Refactor of Allocator classes PR Merge Conflict Check #17689: Pull request #9074 synchronize by winterhazel
4m 8s scclouds:refactor-allocate-to-method
scclouds:refactor-allocate-to-method
4m 8s
Correction of the user responsible for the RESOURCE.UPDATE.LIMIT event PR Merge Conflict Check #17688: Pull request #13066 synchronize by GeanJS
4m 10s scclouds:duplicated-resource-update-limit
scclouds:duplicated-resource-update-limit
4m 10s
CloudStack Volume support with ONTAP storage PR Merge Conflict Check #17687: Pull request #13053 synchronize by rajiv-jain-netapp
Action required NetApp:sync/apache-main-apr-2026
NetApp:sync/apache-main-apr-2026
Action required
CloudStack Volume support with ONTAP storage PR Merge Conflict Check #17686: Pull request #13053 synchronize by rajiv-jain-netapp
Action required NetApp:sync/apache-main-apr-2026
NetApp:sync/apache-main-apr-2026
Action required
ui: fix webhook filters listing PR Merge Conflict Check #17685: Pull request #13068 opened by shwstppr
4m 11s shapeblue:ui-fix-webhookfilters
shapeblue:ui-fix-webhookfilters
4m 11s
[WIP] DNS provider framework - PowerDNS plugin PR Merge Conflict Check #17684: Pull request #12737 synchronize by sudo87
4m 10s shapeblue:dnsProviderFramework
shapeblue:dnsProviderFramework
4m 10s
Bump the github-actions-dependencies group across 1 directory with 9 updates PR Merge Conflict Check #17683: Pull request #13042 synchronize by dependabot Bot
10m 11s dependabot/github_actions/github-actions-dependencies-0f13251b35
dependabot/github_actions/github-actions-dependencies-0f13251b35
10m 11s
Bump the github-actions-dependencies group across 1 directory with 9 … PR Merge Conflict Check #17682: Commit b12eaf5 pushed by dependabot Bot
7s dependabot/github_actions/github-actions-dependencies-0f13251b35
dependabot/github_actions/github-actions-dependencies-0f13251b35
7s
CloudStack Volume support with ONTAP storage PR Merge Conflict Check #17681: Pull request #13053 synchronize by rajiv-jain-netapp
Action required NetApp:sync/apache-main-apr-2026
NetApp:sync/apache-main-apr-2026
Action required
Linstor: fix create volume from snapshot on primary storage PR Merge Conflict Check #17680: Pull request #13043 synchronize by Kukunin
4m 13s Kukunin:linstor-snapshot-to-volume
Kukunin:linstor-snapshot-to-volume
4m 13s
Adding new Dell EMC ECS Object Storage Plugin for CloudStack PR Merge Conflict Check #17679: Pull request #12124 synchronize by mhkadhum
4m 11s mhkadhum:main
mhkadhum:main
4m 11s
Adding new Dell EMC ECS Object Storage Plugin for CloudStack PR Merge Conflict Check #17678: Pull request #12124 synchronize by mhkadhum
Action required mhkadhum:main
mhkadhum:main
Action required
Soft delete port forwarding, load balancing and firewall rules PR Merge Conflict Check #17677: Pull request #13015 synchronize by bernardodemarco
4m 7s scclouds:soft-delete-pf-lb-and-fw-rules
scclouds:soft-delete-pf-lb-and-fw-rules
4m 7s
Correction of the user responsible for the RESOURCE.UPDATE.LIMIT event PR Merge Conflict Check #17676: Pull request #13066 opened by GeanJS
4m 11s scclouds:duplicated-resource-update-limit
scclouds:duplicated-resource-update-limit
4m 11s
[HEALTH] 4.23/main Health Check, please don't merge this! PR Merge Conflict Check #17675: Pull request #12198 synchronize by sureshanaparti
5m 58s healthcheck-main
healthcheck-main
5m 58s
4.21/main Health Check, please don't merge this! PR Merge Conflict Check #17674: Commit c5fe3ac pushed by sureshanaparti
1m 33s healthcheck-main
healthcheck-main
1m 33s
[HEALTH] 4.22 Health Check, please don't merge this! PR Merge Conflict Check #17673: Pull request #12001 synchronize by sureshanaparti
4m 54s healthcheck-4.22
healthcheck-4.22
4m 54s
4.22 Health Check, please don't merge this! PR Merge Conflict Check #17672: Commit aefbdf0 pushed by sureshanaparti
45s healthcheck-4.22
healthcheck-4.22
45s
Merge branch '4.22' PR Merge Conflict Check #17671: Commit 856d83a pushed by sureshanaparti
2h 54m 46s main
main
2h 54m 46s
merge conflict fixes (#13046) PR Merge Conflict Check #17670: Commit 64ac082 pushed by sureshanaparti
1h 30m 13s 4.22
4.22
1h 30m 13s
Introduce new backup provider (KBOSS) PR Merge Conflict Check #17669: Pull request #12758 synchronize by JoaoJandre
4m 25s scclouds:new-native-backup-provider
scclouds:new-native-backup-provider
4m 25s
Remove UUID parse from param processing workflow PR Merge Conflict Check #17668: Pull request #13065 opened by erikbocks
5m 5s scclouds:remove-uuid-parse
scclouds:remove-uuid-parse
5m 5s