Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
2,469 workflow run results
2,469 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[release-1.30] Bump Kubernetes to v1.30.6 Check for merge conflicts #2444: Pull request #5145 synchronize by twz123
October 23, 2024 12:16 10s
October 23, 2024 12:16 10s
[release-1.29] Bump Kubernetes to v1.29.10 Check for merge conflicts #2443: Pull request #5147 opened by twz123
October 23, 2024 12:09 11s
October 23, 2024 12:09 11s
Bump Go to v1.22.8 Check for merge conflicts #2442: Pull request #5146 opened by twz123
October 23, 2024 11:54 10s
October 23, 2024 11:54 10s
[release-1.30] Bump Kubernetes to v1.30.6 Check for merge conflicts #2441: Pull request #5145 opened by twz123
October 23, 2024 11:47 14s
October 23, 2024 11:47 14s
Bump runc to v1.2.0 Check for merge conflicts #2440: Pull request #5144 opened by twz123
October 23, 2024 11:40 11s
October 23, 2024 11:40 11s
[Backport release-1.31] Bump runc to 1.1.15 Check for merge conflicts #2439: Pull request #5142 opened by twz123
October 23, 2024 11:22 10s
October 23, 2024 11:22 10s
Extend inttest RetryWatchErrors unit test Check for merge conflicts #2438: Pull request #5141 opened by twz123
October 23, 2024 10:23 12s
October 23, 2024 10:23 12s
Merge pull request #5137 from twz123/supervisor-prochandle Check for merge conflicts #2437: Commit ba5c8d1 pushed by twz123
October 23, 2024 10:16 2m 12s main
main
October 23, 2024 10:16 2m 12s
Introduce supervisor.procHandle interface Check for merge conflicts #2436: Pull request #5137 synchronize by twz123
October 23, 2024 09:07 10s
October 23, 2024 09:07 10s
Merge pull request #5138 from k0sproject/dependabot/pip/docs/mkdocs-7… Check for merge conflicts #2435: Commit 87c369f pushed by twz123
October 22, 2024 18:40 2m 18s main
main
October 22, 2024 18:40 2m 18s
Introducing K0S Guru on Gurubase.io Check for merge conflicts #2434: Pull request #5139 opened by kursataktas
October 22, 2024 14:20 13s
October 22, 2024 14:20 13s
build(deps): bump the mkdocs group across 1 directory with 3 updates Check for merge conflicts #2433: Pull request #5138 opened by dependabot bot
October 22, 2024 13:46 2m 15s
October 22, 2024 13:46 2m 15s
Merge pull request #5134 from k0sproject/backport-5128-to-release-1.29 Check for merge conflicts #2432: Commit d272121 pushed by makhov
October 22, 2024 11:44 10s release-1.29
release-1.29
October 22, 2024 11:44 10s
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