Skip to content

Actions: microsoft/azurelinux

Actions

Github Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-check.yml
369 workflow runs
369 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch '3.0-dev' into 3.0 Github Merge Conflict Check #373: Commit 8ff742e pushed by jslobodzian
November 23, 2024 16:35 35s 3.0
3.0
November 23, 2024 16:35 35s
iptables: Enable nftables. (#11027) Github Merge Conflict Check #372: Commit e7143fd pushed by jslobodzian
November 23, 2024 16:33 1m 22s 3.0-dev
3.0-dev
November 23, 2024 16:33 1m 22s
Merge branch 'main' into 2.0 Github Merge Conflict Check #371: Commit cadba3d pushed by jslobodzian
November 23, 2024 16:04 29s 2.0
2.0
November 23, 2024 16:04 29s
[AUTO-CHERRYPICK] fluent-bit: Address CVE-2024-25431 - branch 3.0-dev… Github Merge Conflict Check #370: Commit 1330d21 pushed by jslobodzian
November 23, 2024 15:54 35s 3.0-dev
3.0-dev
November 23, 2024 15:54 35s
[AUTO-CHERRYPICK] fluent-bit: Address CVE-2024-25431 - branch 3.0-dev Github Merge Conflict Check #369: Pull request #11194 synchronize by jslobodzian
November 23, 2024 15:47 36s cblmargh/cherry-pick-pr-11096-to-3.0-dev
cblmargh/cherry-pick-pr-11096-to-3.0-dev
November 23, 2024 15:47 36s
python3: Address CVE-2024-11168 with a formatted patch (#11110) Github Merge Conflict Check #368: Commit febc095 pushed by jslobodzian
November 23, 2024 15:25 1m 18s main
main
November 23, 2024 15:25 1m 18s
[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade postgresql to 16.5 CVE-2… Github Merge Conflict Check #367: Commit b05b26a pushed by jslobodzian
November 23, 2024 14:53 30s 3.0-dev
3.0-dev
November 23, 2024 14:53 30s
[AUTO-CHERRYPICK] nodejs and python-tensorboard: patched vendor tarba… Github Merge Conflict Check #366: Commit 8c804cf pushed by jslobodzian
November 23, 2024 14:53 34s 3.0-dev
3.0-dev
November 23, 2024 14:53 34s
[AUTO-CHERRYPICK] Fix CVE-2023-7256 and CVE-2024-8006 for nmap : 3.0 … Github Merge Conflict Check #365: Commit a5e4135 pushed by jslobodzian
November 23, 2024 14:50 35s 3.0-dev
3.0-dev
November 23, 2024 14:50 35s
[AUTO-CHERRYPICK] Fix CVE-2024-9632 for xorg-x11-server-Xwayland - br… Github Merge Conflict Check #364: Commit 0880420 pushed by jslobodzian
November 23, 2024 14:50 32s 3.0-dev
3.0-dev
November 23, 2024 14:50 32s
[AUTO-CHERRYPICK] Fix CVE-2024-21538 in nodejs - branch main (#11189) Github Merge Conflict Check #363: Commit ce9f875 pushed by jslobodzian
November 23, 2024 14:49 29s main
main
November 23, 2024 14:49 29s
[AUTO-CHERRYPICK] [AUTO-PR] azure-core/azurelinux:fasttrack/pawelwi/C… Github Merge Conflict Check #362: Commit 7571f1b pushed by jslobodzian
November 23, 2024 14:49 1m 23s main
main
November 23, 2024 14:49 1m 23s
[AUTO-CHERRYPICK] Fix CVE-2024-10524 for wget :2.0 - branch main (#11… Github Merge Conflict Check #361: Commit 8c06840 pushed by jslobodzian
November 23, 2024 14:48 30s main
main
November 23, 2024 14:48 30s
[AUTO-CHERRYPICK] Fix CVE-2024-35235 for cups :2.0 - branch main (#11… Github Merge Conflict Check #360: Commit fad4d61 pushed by jslobodzian
November 23, 2024 14:48 1m 17s main
main
November 23, 2024 14:48 1m 17s
[AUTO-CHERRYPICK] sriov: Patch CVE-2024-24786 in vendored google.gola… Github Merge Conflict Check #359: Commit 96aab8d pushed by jslobodzian
November 23, 2024 14:47 32s main
main
November 23, 2024 14:47 32s
[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade postgresql to 14.14 CVE-… Github Merge Conflict Check #358: Commit ed5e7c0 pushed by jslobodzian
November 23, 2024 14:47 1m 17s main
main
November 23, 2024 14:47 1m 17s
[AUTO-CHERRYPICK] Fix CVE-2024-21538, CVE-2020-28458 for reaper - bra… Github Merge Conflict Check #357: Commit 3ed988c pushed by jslobodzian
November 23, 2024 14:46 29s main
main
November 23, 2024 14:46 29s
[AUTO-CHERRYPICK] [2.0] tar: Fix CVE-2022-48303 and CVE-2023-39804 - … Github Merge Conflict Check #356: Commit abf0a63 pushed by jslobodzian
November 23, 2024 14:46 31s main
main
November 23, 2024 14:46 31s
[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade clamav to 1.0.7 CVE-2024… Github Merge Conflict Check #355: Commit cb6ef01 pushed by jslobodzian
November 23, 2024 14:45 1m 20s main
main
November 23, 2024 14:45 1m 20s
[AUTO-CHERRYPICK] cmake: Fixes for CVE-2022-43552, CVE-2023-27536, C… Github Merge Conflict Check #354: Commit bddbf86 pushed by jslobodzian
November 23, 2024 14:45 32s main
main
November 23, 2024 14:45 32s
[AUTO-CHERRYPICK] busybox: Address CVE-2023-42366 - branch main (#11122) Github Merge Conflict Check #353: Commit 1bb81db pushed by jslobodzian
November 23, 2024 14:44 33s main
main
November 23, 2024 14:44 33s
[AUTO-CHERRYPICK] Fix CVE-2023-7256 for libpcap :2.0 - branch main (#… Github Merge Conflict Check #352: Commit 70ac1cd pushed by jslobodzian
November 23, 2024 14:44 1m 22s main
main
November 23, 2024 14:44 1m 22s
[AUTO-CHERRYPICK] libsoup: add patches for CVE-2024-52530, CVE-2024-5… Github Merge Conflict Check #351: Commit f5e5a7a pushed by jslobodzian
November 23, 2024 14:43 1m 21s main
main
November 23, 2024 14:43 1m 21s
[AUTO-CHERRYPICK] Fix CVE-2023-7256 and CVE-2024-8006 for nmap: 2.0 -… Github Merge Conflict Check #350: Commit a127791 pushed by jslobodzian
November 23, 2024 14:43 31s main
main
November 23, 2024 14:43 31s
[AUTO-CHERRYPICK] python3: Address CVE-2024-11168 - branch main (#11105) Github Merge Conflict Check #349: Commit e5238d9 pushed by jslobodzian
November 23, 2024 14:21 32s main
main
November 23, 2024 14:21 32s