Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #5096 from ncopa/docker-fixes Check for merge conflicts #2906: Commit 2241665 pushed by ncopa
December 16, 2024 11:10 2m 18s main
main
December 16, 2024 11:10 2m 18s
Bump kine to v0.13.7 Check for merge conflicts #2905: Pull request #5361 opened by twz123
December 16, 2024 10:43 2m 11s
December 16, 2024 10:43 2m 11s
Bump kube-router to v2.4.1 Check for merge conflicts #2904: Pull request #5317 synchronize by twz123
December 16, 2024 10:25 10s
December 16, 2024 10:25 10s
Bump kube-router to v2.4.1 Check for merge conflicts #2903: Pull request #5317 synchronize by twz123
December 16, 2024 10:13 15s
December 16, 2024 10:13 15s
Introduce k0s airgap bundle-artifacts Check for merge conflicts #2902: Pull request #5360 opened by twz123
December 13, 2024 18:24 14s
December 13, 2024 18:24 14s
Merge pull request #5356 from k0sproject/backport-5318-to-release-1.31 Check for merge conflicts #2901: Commit 91d4d65 pushed by twz123
December 13, 2024 14:23 2m 11s release-1.31
release-1.31
December 13, 2024 14:23 2m 11s
Bump google.golang.org/grpc from 1.68.1 to 1.69.0 Check for merge conflicts #2900: Pull request #5358 opened by dependabot bot
December 13, 2024 13:38 9s
December 13, 2024 13:38 9s
Enable gocritic linter Check for merge conflicts #2899: Pull request #5357 opened by twz123
December 13, 2024 13:13 10s
December 13, 2024 13:13 10s
[Backport release-1.31] Bump Kubernetes to v1.31.3 Check for merge conflicts #2898: Pull request #5356 opened by k0s-bot
December 13, 2024 12:42 12s
December 13, 2024 12:42 12s
Merge pull request #5355 from twz123/backport-5349-to-release-1.29 Check for merge conflicts #2897: Commit 7678ac5 pushed by twz123
December 13, 2024 10:57 14s release-1.29
release-1.29
December 13, 2024 10:57 14s
[release-1.29] Bump containerd to v1.7.24 Check for merge conflicts #2896: Pull request #5355 opened by twz123
December 13, 2024 10:15 12s
December 13, 2024 10:15 12s
Reject unknown sub-commands for k0s airgap Check for merge conflicts #2895: Pull request #5354 opened by twz123
December 13, 2024 08:44 10s
December 13, 2024 08:44 10s
Merge pull request #5349 from twz123/backport-5339-to-release-1.30 Check for merge conflicts #2894: Commit 9e5d360 pushed by twz123
December 12, 2024 19:40 2m 11s release-1.30
release-1.30
December 12, 2024 19:40 2m 11s
Merge pull request #5343 from twz123/bump-alpine-3.20 Check for merge conflicts #2893: Commit 3c8cf92 pushed by twz123
December 12, 2024 18:24 2m 15s release-1.31
release-1.31
December 12, 2024 18:24 2m 15s
Merge pull request #5342 from twz123/bump-alpine Check for merge conflicts #2892: Commit e338b28 pushed by twz123
December 12, 2024 18:24 2m 18s main
main
December 12, 2024 18:24 2m 18s
Merge pull request #5346 from twz123/backport-5300-to-release-1.29 Check for merge conflicts #2891: Commit 9088f42 pushed by twz123
December 12, 2024 18:23 2m 13s release-1.29
release-1.29
December 12, 2024 18:23 2m 13s
Bump github.com/k0sproject/k0sctl from 0.19.4 to 0.20.0 in /hack/tool Check for merge conflicts #2890: Pull request #5333 synchronize by dependabot bot
December 12, 2024 11:35 2m 14s
December 12, 2024 11:35 2m 14s
Merge pull request #5347 from k0sproject/backport-5344-to-release-1.29 Check for merge conflicts #2889: Commit e0afa89 pushed by jnummelin
December 12, 2024 11:31 2m 11s release-1.29
release-1.29
December 12, 2024 11:31 2m 11s
Merge pull request #5351 from k0sproject/backport-5348-to-release-1.31 Check for merge conflicts #2888: Commit 166c5b4 pushed by jnummelin
December 12, 2024 11:30 2m 12s release-1.31
release-1.31
December 12, 2024 11:30 2m 12s
Bump golang.org/x/crypto from 0.30.0 to 0.31.0 Check for merge conflicts #2887: Pull request #5353 opened by dependabot bot
December 12, 2024 00:15 14s
December 12, 2024 00:15 14s
Bump golang.org/x/crypto from 0.29.0 to 0.31.0 in /hack/tool Check for merge conflicts #2886: Pull request #5352 opened by dependabot bot
December 12, 2024 00:15 11s
December 12, 2024 00:15 11s
[Backport release-1.31] Use fixed kube-router image Check for merge conflicts #2885: Pull request #5351 opened by k0s-bot
December 12, 2024 00:05 11s
December 12, 2024 00:05 11s
Merge pull request #5348 from twz123/update-kube-router-image Check for merge conflicts #2884: Commit 984e928 pushed by twz123
December 12, 2024 00:04 2m 16s main
main
December 12, 2024 00:04 2m 16s
CPLB userspace reverse proxy load balancer Check for merge conflicts #2883: Pull request #5279 synchronize by juanluisvaladas
December 11, 2024 17:19 15s
December 11, 2024 17:19 15s
CPLB userspace reverse proxy load balancer Check for merge conflicts #2882: Pull request #5279 synchronize by juanluisvaladas
December 11, 2024 17:14 11s
December 11, 2024 17:14 11s