Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
2,506 workflow runs
2,506 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #5135 from k0sproject/backport-5128-to-release-1.30 Check for merge conflicts #2431: Commit 19a8a9d pushed by makhov
October 22, 2024 11:44 10s release-1.30
release-1.30
October 22, 2024 11:44 10s
Merge pull request #5136 from k0sproject/backport-5128-to-release-1.31 Check for merge conflicts #2430: Commit 4d42131 pushed by makhov
October 22, 2024 11:10 10s release-1.31
release-1.31
October 22, 2024 11:10 10s
Introduce supervisor.procHandle interface Check for merge conflicts #2429: Pull request #5137 opened by twz123
October 22, 2024 09:27 10s
October 22, 2024 09:27 10s
[Backport release-1.31] Fix env variables propagation to k0s service Check for merge conflicts #2428: Pull request #5136 opened by k0s-bot
October 22, 2024 09:09 18s
October 22, 2024 09:09 18s
[Backport release-1.30] Fix env variables propagation to k0s service Check for merge conflicts #2427: Pull request #5135 opened by k0s-bot
October 22, 2024 09:09 13s
October 22, 2024 09:09 13s
[Backport release-1.29] Fix env variables propagation to k0s service Check for merge conflicts #2426: Pull request #5134 opened by k0s-bot
October 22, 2024 09:09 12s
October 22, 2024 09:09 12s
Merge pull request #5128 from apedriza/fix/env_variables_reading Check for merge conflicts #2425: Commit 0962379 pushed by apedriza
October 22, 2024 08:59 2m 12s main
main
October 22, 2024 08:59 2m 12s
Fixes #4318 - k0s reset should not delete all when drives fail to unmount Check for merge conflicts #2424: Pull request #5132 opened by MichaelDausmann
October 22, 2024 01:39 3m 28s
October 22, 2024 01:39 3m 28s
Applier manager improvements Check for merge conflicts #2423: Pull request #5062 synchronize by emosbaugh
October 21, 2024 13:55 11s
October 21, 2024 13:55 11s
build(deps): bump shogo82148/actions-upload-release-asset from 1.7.7 to 1.7.8 Check for merge conflicts #2422: Pull request #5131 opened by dependabot bot
October 21, 2024 13:47 2m 11s
October 21, 2024 13:47 2m 11s
Merge pull request #5094 from ncopa/runc-1.1.15 Check for merge conflicts #2421: Commit 182b1c5 pushed by ncopa
October 21, 2024 13:47 2m 13s main
main
October 21, 2024 13:47 2m 13s
Applier manager improvements Check for merge conflicts #2420: Pull request #5062 synchronize by twz123
October 21, 2024 13:40 2m 11s
October 21, 2024 13:40 2m 11s
Consolidate docs files around contributing Check for merge conflicts #2419: Pull request #5113 synchronize by twz123
October 21, 2024 13:33 9s
October 21, 2024 13:33 9s
Merge pull request #5110 from twz123/use-secret-types Check for merge conflicts #2418: Commit af59855 pushed by twz123
October 21, 2024 13:25 2m 15s main
main
October 21, 2024 13:25 2m 15s
Merge pull request #5125 from ncopa/containerd-1.7.23 Check for merge conflicts #2417: Commit 4895785 pushed by twz123
October 21, 2024 13:24 2m 12s main
main
October 21, 2024 13:24 2m 12s
build(deps): bump the mkdocs group across 1 directory with 2 updates Check for merge conflicts #2416: Pull request #5130 opened by dependabot bot
October 21, 2024 13:21 12s
October 21, 2024 13:21 12s
build(deps): bump markupsafe from 3.0.1 to 3.0.2 in /docs Check for merge conflicts #2415: Pull request #5129 opened by dependabot bot
October 21, 2024 13:21 2m 10s
October 21, 2024 13:21 2m 10s
Fix env variables propagation to k0s service Check for merge conflicts #2414: Pull request #5128 opened by apedriza
October 21, 2024 07:52 13s
October 21, 2024 07:52 13s
build(deps): bump shogo82148/actions-create-release from 1.7.5 to 1.7.6 Check for merge conflicts #2413: Pull request #5127 opened by dependabot bot
October 18, 2024 13:30 9s
October 18, 2024 13:30 9s
build(deps): bump the mkdocs group across 1 directory with 2 updates Check for merge conflicts #2412: Pull request #5126 opened by dependabot bot
October 17, 2024 13:37 22s
October 17, 2024 13:37 22s
Bump containerd to 1.7.23 Check for merge conflicts #2411: Pull request #5125 opened by ncopa
October 17, 2024 12:02 10s
October 17, 2024 12:02 10s
Merge pull request #5076 from ncopa/parallel-seccomp-tests Check for merge conflicts #2410: Commit 9a7b4d1 pushed by ncopa
October 17, 2024 11:55 2m 10s main
main
October 17, 2024 11:55 2m 10s
Bump runc to 1.1.15 Check for merge conflicts #2409: Pull request #5094 synchronize by ncopa
October 17, 2024 11:36 2m 17s
October 17, 2024 11:36 2m 17s
fix: clear stack watchers map when lost leader lease Check for merge conflicts #2408: Pull request #5123 synchronize by emosbaugh
October 16, 2024 20:54 15s
October 16, 2024 20:54 15s
fix: clear stack watchers map when lost leader lease Check for merge conflicts #2407: Pull request #5123 synchronize by emosbaugh
October 16, 2024 20:52 14s
October 16, 2024 20:52 14s