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
merge conflict fixes PR Merge Conflict Check #17661: Pull request #13046 synchronize by sureshanaparti
4m 13s UnmanagedAndSnapshotFixes
UnmanagedAndSnapshotFixes
4m 13s
fix pre-commit issue PR Merge Conflict Check #17660: Commit d24beb0 pushed by sureshanaparti
7s UnmanagedAndSnapshotFixes
UnmanagedAndSnapshotFixes
7s
merge conflict fixes PR Merge Conflict Check #17659: Pull request #13046 synchronize by sureshanaparti
4m 10s UnmanagedAndSnapshotFixes
UnmanagedAndSnapshotFixes
4m 10s
fix pre-commit issue PR Merge Conflict Check #17658: Commit 94b661d pushed by sureshanaparti
9s UnmanagedAndSnapshotFixes
UnmanagedAndSnapshotFixes
9s
Translation of missing labels to Portuguese PR Merge Conflict Check #17657: Pull request #12947 synchronize by Tonitzpp
Action required scclouds:portuguese-labels
scclouds:portuguese-labels
Action required
flasharray: authenticate via REST 2.x api-token and discover API version PR Merge Conflict Check #17656: Pull request #13060 synchronize by genegr
4m 13s genegr:feat/flasharray-rest2x-apitoken-auth
genegr:feat/flasharray-rest2x-apitoken-auth
4m 13s
Bump fast-xml-parser and minio in /ui PR Merge Conflict Check #17655: Pull request #13062 opened by dependabot Bot
4m 10s dependabot/npm_and_yarn/ui/multi-d3e3352a11
dependabot/npm_and_yarn/ui/multi-d3e3352a11
4m 10s
Bump fast-xml-parser and minio in /ui PR Merge Conflict Check #17654: Commit 952bcce pushed by dependabot Bot
8s dependabot/npm_and_yarn/ui/multi-d3e3352a11
dependabot/npm_and_yarn/ui/multi-d3e3352a11
8s
adaptive: honor user-provided capacityBytes when provider stats are unavailable PR Merge Conflict Check #17653: Pull request #13059 synchronize by genegr
4m 13s genegr:feat/adaptive-lifecycle-honor-user-capacity
genegr:feat/adaptive-lifecycle-honor-user-capacity
4m 13s
flasharray: fall back to array capacity when pod has no quota PR Merge Conflict Check #17652: Pull request #13050 synchronize by genegr
4m 12s genegr:fix/flasharray-managed-stats-array-capacity-fallback
genegr:fix/flasharray-managed-stats-array-capacity-fallback
4m 12s
Fix/flasharray delete rename destroy patch conflict PR Merge Conflict Check #17651: Pull request #13049 synchronize by genegr
4m 11s genegr:fix/flasharray-delete-rename-destroy-patch-conflict
genegr:fix/flasharray-delete-rename-destroy-patch-conflict
4m 11s
flasharray/kvm/adaptive: NVMe-TCP transport for FlashArray primary storage PR Merge Conflict Check #17650: Pull request #13061 synchronize by genegr
4m 16s genegr:feat/flasharray-nvme-tcp-support
genegr:feat/flasharray-nvme-tcp-support
4m 16s
Add option to control MAC address reuse for VR public NICs PR Merge Conflict Check #17649: Pull request #13001 synchronize by bernardodemarco
4m 11s scclouds:change-mac-address-of-public-nics-of-vrs
scclouds:change-mac-address-of-public-nics-of-vrs
4m 11s
flasharray/kvm/adaptive: NVMe-TCP transport for FlashArray primary storage PR Merge Conflict Check #17648: Pull request #13061 opened by genegr
Action required genegr:feat/flasharray-nvme-tcp-support
genegr:feat/flasharray-nvme-tcp-support
Action required
flasharray: authenticate via REST 2.x api-token and discover API version PR Merge Conflict Check #17647: Pull request #13060 opened by genegr
5m 48s genegr:feat/flasharray-rest2x-apitoken-auth
genegr:feat/flasharray-rest2x-apitoken-auth
5m 48s
adaptive: honor user-provided capacityBytes when provider stats are unavailable PR Merge Conflict Check #17646: Pull request #13059 opened by genegr
Action required genegr:feat/adaptive-lifecycle-honor-user-capacity
genegr:feat/adaptive-lifecycle-honor-user-capacity
Action required
Release reserved storage resources on VM deployment failure PR Merge Conflict Check #17645: Pull request #13048 synchronize by winterhazel
6m 34s scclouds:fix-storage-resource-allocation-on-vm-deploy-4.22
scclouds:fix-storage-resource-allocation-on-vm-deploy-4.22
6m 34s
Backport: Honour consoleproxy.session.timeout for noVNC console sessions PR Merge Conflict Check #17644: Pull request #13058 opened by dheeraj12347
Action required dheeraj12347:backport-12810-consoleproxy-timeout-4.20
dheeraj12347:backport-12810-consoleproxy-timeout-4.20
Action required
flasharray: fall back to array capacity when pod has no quota PR Merge Conflict Check #17643: Pull request #13050 synchronize by genegr
Action required genegr:fix/flasharray-managed-stats-array-capacity-fallback
genegr:fix/flasharray-managed-stats-array-capacity-fallback
Action required
Introduce new backup provider (KBOSS) PR Merge Conflict Check #17642: Pull request #12758 synchronize by JoaoJandre
4m 13s scclouds:new-native-backup-provider
scclouds:new-native-backup-provider
4m 13s
Honour consoleproxy.session.timeout for noVNC sessions (fixes #12810) PR Merge Conflict Check #17641: Pull request #13002 synchronize by dheeraj12347
Action required dheeraj12347:fix-12810-consoleproxy-timeout
dheeraj12347:fix-12810-consoleproxy-timeout
Action required
NPE correction when informing removed project in the listProjectRoles PR Merge Conflict Check #17640: Pull request #13022 synchronize by Tonitzpp
Action required scclouds:npe-in-listprojects
scclouds:npe-in-listprojects
Action required
NPE correction when informing removed project in the listProjectRoles PR Merge Conflict Check #17639: Pull request #13022 synchronize by Tonitzpp
Action required scclouds:npe-in-listprojects
scclouds:npe-in-listprojects
Action required
CloudStack Volume support with ONTAP storage PR Merge Conflict Check #17638: Pull request #13053 opened by rajiv-jain-netapp
4m 10s NetApp:sync/apache-main-apr-2026
NetApp:sync/apache-main-apr-2026
4m 10s
Fix/flasharray delete rename destroy patch conflict PR Merge Conflict Check #17637: Pull request #13049 synchronize by genegr
4m 9s genegr:fix/flasharray-delete-rename-destroy-patch-conflict
genegr:fix/flasharray-delete-rename-destroy-patch-conflict
4m 9s