Skip to content

Actions: weizhouapache/cloudstack

Actions

PR Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-checker.yml
361 workflow runs
361 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
NE: apply copilot's suggestions PR Merge Conflict Check #1221: Commit c8a83fb pushed by weizhouapache
7s 4.23-network-extension
4.23-network-extension
7s
NE: more unit tests and UI optimization PR Merge Conflict Check #1220: Commit 3176c3a pushed by weizhouapache
7s 4.23-network-extension
4.23-network-extension
7s
NE: more unit tests and UI optimization PR Merge Conflict Check #1219: Commit 47e83ec pushed by weizhouapache
8s 4.23-network-extension
4.23-network-extension
8s
Revert changes on CreateNetworkOfferingCmd.java PR Merge Conflict Check #1218: Commit c0734ec pushed by weizhouapache
7s 4.22.0.0-wei-veeam-netns
4.22.0.0-wei-veeam-netns
7s
NE: UI cleanup PR Merge Conflict Check #1217: Commit 474c073 pushed by weizhouapache
10s 4.23-network-extension
4.23-network-extension
10s
api/server: apply suggestions PR Merge Conflict Check #1216: Commit 5383301 pushed by weizhouapache
8s 4.23-network-extension
4.23-network-extension
8s
gha: fix EOF again PR Merge Conflict Check #1215: Commit 02e415d pushed by weizhouapache
10s 4.23-network-extension
4.23-network-extension
10s
add unit tests PR Merge Conflict Check #1214: Commit 6cdaaad pushed by weizhouapache
10s 4.23-network-extension
4.23-network-extension
10s
gha: fix EOF and license PR Merge Conflict Check #1213: Commit 416b2cb pushed by weizhouapache
6s 4.23-network-extension
4.23-network-extension
6s
Network Extension: Orchestrate external Network devices PR Merge Conflict Check #1212: Commit d27753e pushed by weizhouapache
7s 4.23-network-extension
4.23-network-extension
7s
server: fix lastpinged of hosts PR Merge Conflict Check #1211: Commit 60fe960 pushed by weizhouapache
6s 4.20-fix-host-lastpinged
4.20-fix-host-lastpinged
6s
vmware: do not check secondary storage when start a system vm PR Merge Conflict Check #1210: Commit decf87d pushed by weizhouapache
11s 4.22-vmware-systemvm-no-ss-check
4.22-vmware-systemvm-no-ss-check
11s
Veeam: support v13 with oAuth2 and JSON response PR Merge Conflict Check #1209: Commit 226ce1d pushed by weizhouapache
9s 4.22.0.0-veeam13
4.22.0.0-veeam13
9s
Routed VR: accept packets from related and established connections PR Merge Conflict Check #1208: Commit 605a7e5 pushed by weizhouapache
9s 4.20-fix-routed-vr-ssh
4.20-fix-routed-vr-ssh
9s
more fixes PR Merge Conflict Check #1207: Commit c2de454 pushed by weizhouapache
6s 4.22.0.0-ext
4.22.0.0-ext
6s
more fixes on iptables rules and network services, host selection PR Merge Conflict Check #1206: Commit 1a7220e pushed by weizhouapache
9s 4.22.0.0-ext
4.22.0.0-ext
9s
netns: fix network-namespace-wrapper.sh PR Merge Conflict Check #1205: Commit 3c95b59 pushed by weizhouapache
9s 4.22.0.0-ext
4.22.0.0-ext
9s
same code as main PR Merge Conflict Check #1204: Commit 57e1850 pushed by weizhouapache
10s 4.20-fix-missing-new-systemvm-template
4.20-fix-missing-new-systemvm-template
10s
fix test failure PR Merge Conflict Check #1203: Commit c0cbf79 pushed by weizhouapache
7s 4.20-fix-missing-new-systemvm-template
4.20-fix-missing-new-systemvm-template
7s
engine/schema: fix new systemvm template is not registered during upg… PR Merge Conflict Check #1202: Commit 0f75453 pushed by weizhouapache
10s 4.20-fix-missing-new-systemvm-template
4.20-fix-missing-new-systemvm-template
10s
Update 2026-04-02 PR Merge Conflict Check #1201: Commit d232389 pushed by weizhouapache
8s 4.22.0.0-ext
4.22.0.0-ext
8s
Update 2026-04-01 PR Merge Conflict Check #1200: Commit 33fcf95 pushed by weizhouapache
8s 4.22.0.0-ext
4.22.0.0-ext
8s
Update plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm… PR Merge Conflict Check #1199: Commit 8fb2437 pushed by weizhouapache
11s 4.22-fix-virsh-destroy-vm-ha
4.22-fix-virsh-destroy-vm-ha
11s
kvm: add LibvirtCheckVirtualMachineCommandWrapperTest PR Merge Conflict Check #1198: Commit f91a776 pushed by weizhouapache
7s 4.22-fix-virsh-destroy-vm-ha
4.22-fix-virsh-destroy-vm-ha
7s
kvm: fix wrong CheckVirtualMachineAnswer when vm does not exist PR Merge Conflict Check #1197: Commit ad7e45e pushed by weizhouapache
8s 4.22-fix-virsh-destroy-vm-ha
4.22-fix-virsh-destroy-vm-ha
8s