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
5,331 workflow runs
5,331 workflow runs
Event

Filter by event

Loading
Status

Filter by status

Loading
Branch
Actor

Filter by actor

Loading
prevent an NPE on an uninitialised TemplateObject (#8898) PR Merge Conflict Check #8664: Commit 6b25ed7 pushed by sureshanaparti
June 26, 2024 15:32 16m 17s 4.18
4.18
June 26, 2024 15:32 16m 17s
[Veeam] disable jobs but keep backups PR Merge Conflict Check #8663: Pull request #6589 synchronize by BryanMLima
June 26, 2024 13:49 12s
June 26, 2024 13:49 12s
Improve migration of external VMware VMs into KVM cluster PR Merge Conflict Check #8662: Pull request #8815 synchronize by sureshanaparti
June 26, 2024 13:18 18s
June 26, 2024 13:18 18s
updated install-non-oss with vmware v7.0 and v8.0 PR Merge Conflict Check #8661: Pull request #9205 synchronize by oferchen
June 26, 2024 12:33 17s
June 26, 2024 12:33 17s
veeam: fix issues with PreSetup and DVS and Solidfire (#9256) PR Merge Conflict Check #8660: Commit 22cd00f pushed by sureshanaparti
June 26, 2024 12:32 48m 21s 4.19
4.19
June 26, 2024 12:32 48m 21s
updated install-non-oss with vmware v7.0 and v8.0 PR Merge Conflict Check #8659: Pull request #9205 synchronize by oferchen
June 26, 2024 12:30 13s
June 26, 2024 12:30 13s
Fix ordering of secondary storages with the algorithm firstfitleastconsumed PR Merge Conflict Check #8658: Pull request #8557 synchronize by GaOrtiga
June 26, 2024 11:55 15s
June 26, 2024 11:55 15s
server: event for HA vm start (#9202) PR Merge Conflict Check #8657: Commit b22315d pushed by vishesh92
June 26, 2024 10:08 54m 16s 4.19
4.19
June 26, 2024 10:08 54m 16s
server: fix resource count updated unmanage vm (#8169) PR Merge Conflict Check #8656: Commit 7a8066d pushed by vishesh92
June 26, 2024 09:04 58m 20s 4.19
4.19
June 26, 2024 09:04 58m 20s
agent: reconnect after waiting 5 seconds (#9258) PR Merge Conflict Check #8655: Commit 52247c5 pushed by sureshanaparti
June 26, 2024 09:03 1m 13s 4.19
4.19
June 26, 2024 09:03 1m 13s
Added ostypeid in the snapshot response (#9150) PR Merge Conflict Check #8654: Commit f7f7013 pushed by sureshanaparti
June 26, 2024 08:48 14m 54s 4.19
4.19
June 26, 2024 08:48 14m 54s
Temporarily backup StorPool volume before expunge (#8843) PR Merge Conflict Check #8653: Commit 6c06e85 pushed by sureshanaparti
June 26, 2024 08:28 20m 40s 4.19
4.19
June 26, 2024 08:28 20m 40s
PowerFlex/ScaleIO SDC client connection improvements PR Merge Conflict Check #8652: Pull request #9268 synchronize by sureshanaparti
June 26, 2024 08:11 14s
June 26, 2024 08:11 14s
UI: ignore error host is already in the database when create a zone (… PR Merge Conflict Check #8651: Commit 1218392 pushed by sureshanaparti
June 26, 2024 07:59 28m 36s 4.19
4.19
June 26, 2024 07:59 28m 36s
server: refactor listNetworks api database retrievals PR Merge Conflict Check #8650: Pull request #9184 synchronize by shwstppr
June 26, 2024 07:50 13s
June 26, 2024 07:50 13s
Change storage pool scope from Cluster to Zone and vise versa PR Merge Conflict Check #8649: Pull request #8875 synchronize by abh1sar
June 26, 2024 07:42 11s
June 26, 2024 07:42 11s
[DRAFT] xenserver: do not destroy halted hypervisor vm PR Merge Conflict Check #8648: Pull request #9175 synchronize by shwstppr
June 26, 2024 06:56 28m 15s
June 26, 2024 06:56 28m 15s
CKS/calico: set arp_ignore and arp_announce to 0 in k8s controller/no… PR Merge Conflict Check #8647: Commit ae4b6d3 pushed by sureshanaparti
June 26, 2024 06:48 1h 10m 16s 4.19
4.19
June 26, 2024 06:48 1h 10m 16s
Honour listall param for list templates api (#9300) PR Merge Conflict Check #8646: Commit 4f85c3f pushed by sureshanaparti
June 26, 2024 06:39 8m 57s 4.19
4.19
June 26, 2024 06:39 8m 57s
fix build error with FiberChannelAdapter after forward-merge PR Merge Conflict Check #8645: Commit 3a0c312 pushed by weizhouapache
June 26, 2024 06:35 3h 20m 31s main
main
June 26, 2024 06:35 3h 20m 31s
Change storage pool scope from Cluster to Zone and vise versa PR Merge Conflict Check #8644: Pull request #8875 synchronize by abh1sar
June 26, 2024 05:30 14s
June 26, 2024 05:30 14s
Change storage pool scope from Cluster to Zone and vise versa PR Merge Conflict Check #8643: Pull request #8875 synchronize by abh1sar
June 26, 2024 05:26 12s
June 26, 2024 05:26 12s
Fix for race when automatically assigning IP to Vms PR Merge Conflict Check #8642: Pull request #9240 synchronize by abh1sar
June 26, 2024 05:20 13s
June 26, 2024 05:20 13s
Honour listall param for list templates api PR Merge Conflict Check #8641: Pull request #9300 synchronize by vishesh92
June 26, 2024 05:08 16s
June 26, 2024 05:08 16s
engine-storage: Set SecretConsumerDetail for VM live migration with storage on shared NFS PR Merge Conflict Check #8640: Pull request #9222 synchronize by abh1sar
June 26, 2024 05:02 18s
June 26, 2024 05:02 18s