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
6,170 workflow runs
6,170 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

StorPool: fix of delete snapshot (#9855) PR Merge Conflict Check #10144: Commit be24733 pushed by JoaoJandre
November 4, 2024 11:52 25m 21s main
main
November 4, 2024 11:52 25m 21s
linstor/kvm: Workaround a qemu bug and IDE bus discard enabled. (#9859) PR Merge Conflict Check #10143: Commit a6cef7a pushed by JoaoJandre
November 4, 2024 11:46 52m 14s 4.19
4.19
November 4, 2024 11:46 52m 14s
Improve logging to include more identifiable information PR Merge Conflict Check #10142: Pull request #9873 synchronize by vishesh92
November 4, 2024 09:54 17s
November 4, 2024 09:54 17s
Improvement: management server peer states PR Merge Conflict Check #10141: Pull request #9885 synchronize by weizhouapache
November 4, 2024 08:39 15s
November 4, 2024 08:39 15s
Improvement: management server peer states PR Merge Conflict Check #10140: Pull request #9885 synchronize by weizhouapache
November 4, 2024 08:36 15s
November 4, 2024 08:36 15s
Allow VMWare import via another host PR Merge Conflict Check #10139: Pull request #9787 synchronize by vishesh92
November 4, 2024 07:18 15s
November 4, 2024 07:18 15s
api,agent,server,engine-schema: scalability improvements PR Merge Conflict Check #10138: Pull request #9840 synchronize by shwstppr
November 4, 2024 07:09 13s
November 4, 2024 07:09 13s
enable to create VPC portfowarding rules with source cidr PR Merge Conflict Check #10137: Pull request #7081 synchronize by winterhazel
November 1, 2024 14:27 14s
November 1, 2024 14:27 14s
enable to create VPC portfowarding rules with source cidr PR Merge Conflict Check #10136: Pull request #7081 synchronize by winterhazel
October 31, 2024 20:36 14s
October 31, 2024 20:36 14s
enable to create VPC portfowarding rules with source cidr PR Merge Conflict Check #10135: Pull request #7081 synchronize by winterhazel
October 31, 2024 19:18 16s
October 31, 2024 19:18 16s
enable to create VPC portfowarding rules with source cidr PR Merge Conflict Check #10134: Pull request #7081 synchronize by winterhazel
October 31, 2024 18:55 14s
October 31, 2024 18:55 14s
Linstor: add support for ISO block devices and direct download PR Merge Conflict Check #10133: Pull request #9792 synchronize by rp-
October 31, 2024 07:32 13s
October 31, 2024 07:32 13s
Linstor: add support for ISO block devices and direct download PR Merge Conflict Check #10132: Pull request #9792 synchronize by rp-
October 31, 2024 07:30 13s
October 31, 2024 07:30 13s
StorPool: fix of delete snapshot PR Merge Conflict Check #10131: Pull request #9855 synchronize by slavkap
October 30, 2024 13:38 16s
October 30, 2024 13:38 16s
list hosts API fix, when any stale entries exists on storage_pool_host_ref for the removed pools PR Merge Conflict Check #10130: Pull request #9852 synchronize by sureshanaparti
October 30, 2024 12:13 15s
October 30, 2024 12:13 15s
Add Cloudian HyperStore Object Storage PR Merge Conflict Check #10129: Pull request #9748 synchronize by tpodowd
October 30, 2024 06:53 1h 13m 29s
October 30, 2024 06:53 1h 13m 29s
Bump elliptic from 6.5.4 to 6.6.0 in /ui PR Merge Conflict Check #10128: Commit e2405c7 pushed by dependabot bot
October 30, 2024 00:29 16s dependabot/npm_and_yarn/ui/elliptic-6.6.0
dependabot/npm_and_yarn/ui/elliptic-6.6.0
October 30, 2024 00:29 16s
KVM incremental snapshot feature PR Merge Conflict Check #10127: Pull request #9270 synchronize by JoaoJandre
October 29, 2024 20:12 9s
October 29, 2024 20:12 9s
KVM incremental snapshot feature PR Merge Conflict Check #10126: Pull request #9270 synchronize by JoaoJandre
October 29, 2024 20:07 16s
October 29, 2024 20:07 16s
Linstor: fix live migrate on non-hyperconverged setups PR Merge Conflict Check #10125: Pull request #9832 synchronize by rp-
October 29, 2024 14:10 19s
October 29, 2024 14:10 19s
Linstor: add support for ISO block devices and direct download PR Merge Conflict Check #10124: Pull request #9792 synchronize by rp-
October 29, 2024 12:21 14s
October 29, 2024 12:21 14s
[HEALTH] 4.20/main Health Check, please don't merge this! PR Merge Conflict Check #10123: Pull request #9817 synchronize by DaanHoogland
October 29, 2024 09:30 14s
October 29, 2024 09:30 14s
4.20/main Health Check, please don't merge this! PR Merge Conflict Check #10122: Commit 930125e pushed by DaanHoogland
October 29, 2024 09:30 17s healthcheck-main
healthcheck-main
October 29, 2024 09:30 17s
UI improvements PR Merge Conflict Check #10121: Pull request #9773 synchronize by abh1sar
October 29, 2024 08:52 16s
October 29, 2024 08:52 16s
StorPool: fix of delete snapshot PR Merge Conflict Check #10120: Pull request #9855 synchronize by slavkap
October 28, 2024 16:29 13s
October 28, 2024 16:29 13s