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
351 workflow runs
351 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update method to findOneInUpStateByLongestRuntime PR Merge Conflict Check #1026: Commit 06b0504 pushed by weizhouapache
9s 4.20-fix-11564
4.20-fix-11564
9s
Update 11573 PR Merge Conflict Check #1025: Commit f1e91c4 pushed by weizhouapache
8s 4.20-fix-11564
4.20-fix-11564
8s
server: run the vm scheduler poll task on only one management server PR Merge Conflict Check #1024: Commit 7ecfb41 pushed by weizhouapache
6s 4.20-fix-11564
4.20-fix-11564
6s
Merge branch 'main' into 4.22-ssl-offloading PR Merge Conflict Check #1023: Commit 0599cf6 pushed by weizhouapache
7s 4.22-ssl-offloading
4.22-ssl-offloading
7s
SSL offloading: UI changes part 2 PR Merge Conflict Check #1022: Commit d470e05 pushed by weizhouapache
8s 4.22-ssl-offloading
4.22-ssl-offloading
8s
SSL offloading: UI fixes part 1 PR Merge Conflict Check #1021: Commit 3a457ab pushed by weizhouapache
6s 4.22-ssl-offloading
4.22-ssl-offloading
6s
Merge branch '4.19' into 4.19-fix-vpc-vr-health-check-no-tier PR Merge Conflict Check #1020: Commit 56f5ae9 pushed by weizhouapache
14s 4.19-fix-vpc-vr-health-check-no-tier
4.19-fix-vpc-vr-health-check-no-tier
14s
test: check backup VR as well PR Merge Conflict Check #1019: Commit 9a63b50 pushed by weizhouapache
8s 4.19-fix-test-caused-by-pr11518
4.19-fix-test-caused-by-pr11518
8s
Update api/src/main/java/org/apache/cloudstack/api/command/user/netwo… PR Merge Conflict Check #1018: Commit 355ebd3 pushed by weizhouapache
8s 4.22-list-networks-by-name
4.22-list-networks-by-name
8s
systemvm template: update URLs of debian ISOs PR Merge Conflict Check #1017: Commit 4e5548b pushed by weizhouapache
7s 4.20-update-debian-urls
4.20-update-debian-urls
7s
Merge branch 'main' into 4.21-md5sum-to-sha512sum PR Merge Conflict Check #1016: Commit 1b63245 pushed by weizhouapache
7s 4.21-md5sum-to-sha512sum
4.21-md5sum-to-sha512sum
7s
test: fix test_04_rvpc_network_garbage_collector_nics failure PR Merge Conflict Check #1015: Commit 28e5672 pushed by weizhouapache
6s 4.19-fix-test-caused-by-pr11518
4.19-fix-test-caused-by-pr11518
6s
Move SQL to schema-42100to42200.sql PR Merge Conflict Check #1014: Commit ed628f3 pushed by weizhouapache
6s 4.21-md5sum-to-sha512sum
4.21-md5sum-to-sha512sum
6s
Merge branch 'main' into 4.21-add-UuidUtils.nameUUIDFromBytes PR Merge Conflict Check #1013: Commit 604b37b pushed by weizhouapache
5s 4.21-add-UuidUtils.nameUUIDFromBytes
4.21-add-UuidUtils.nameUUIDFromBytes
5s
Merge branch 'main' into 4.21-add-pre-check PR Merge Conflict Check #1012: Commit a444e0b pushed by weizhouapache
5s 4.21-add-pre-check
4.21-add-pre-check
5s
Merge branch 'main' into 4.21-md5sum-to-sha512sum PR Merge Conflict Check #1011: Commit 661e3f3 pushed by weizhouapache
7s 4.21-md5sum-to-sha512sum
4.21-md5sum-to-sha512sum
7s
Merge branch 'main' into 4.21-md5sum-to-sha512sum PR Merge Conflict Check #1010: Commit 6a333fd pushed by weizhouapache
8s 4.21-md5sum-to-sha512sum
4.21-md5sum-to-sha512sum
8s
Merge branch 'main' into 4.21-add-UuidUtils.nameUUIDFromBytes PR Merge Conflict Check #1009: Commit 7b54a12 pushed by weizhouapache
8s 4.21-add-UuidUtils.nameUUIDFromBytes
4.21-add-UuidUtils.nameUUIDFromBytes
8s
api: use single quote instead of double quote in StatsResponse PR Merge Conflict Check #1008: Commit 6b619f9 pushed by weizhouapache
8s 4.19-remove-double-quote
4.19-remove-double-quote
8s
Fix PR 13922 PR Merge Conflict Check #1007: Commit 59f3744 pushed by weizhouapache
6s 4.21-add-UuidUtils.nameUUIDFromBytes
4.21-add-UuidUtils.nameUUIDFromBytes
6s
Merge remote-tracking branch 'apache/main' into 4.21-add-UuidUtils.na… PR Merge Conflict Check #1006: Commit ee438f2 pushed by weizhouapache
11s 4.21-add-UuidUtils.nameUUIDFromBytes
4.21-add-UuidUtils.nameUUIDFromBytes
11s
Merge remote-tracking branch 'apache/4.19' into 4.20 PR Merge Conflict Check #1005: Commit f489dc4 pushed by weizhouapache
4s 4.20
4.20
4s
Update 11228 PR Merge Conflict Check #1004: Commit 807dd9a pushed by weizhouapache
12s 4.20-fix-password-reset-starttls
4.20-fix-password-reset-starttls
12s
Merge branch '4.20' into 4.20-fix-password-reset-starttls PR Merge Conflict Check #1003: Commit 3f6d458 pushed by weizhouapache
7s 4.20-fix-password-reset-starttls
4.20-fix-password-reset-starttls
7s
SSL offloading: add unit tests PR Merge Conflict Check #1002: Commit 104e5c1 pushed by weizhouapache
8s 4.22-ssl-offloading
4.22-ssl-offloading
8s