Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump github.com/Microsoft/hcsshim from 0.11.7 to 0.12.6 Check for merge conflicts #2071: Pull request #4878 synchronize by dependabot bot
September 12, 2024 19:57 14s
September 12, 2024 19:57 14s
build(deps): bump google.golang.org/grpc from 1.66.0 to 1.66.2 Check for merge conflicts #2070: Pull request #4964 synchronize by dependabot bot
September 12, 2024 19:57 2m 16s
September 12, 2024 19:57 2m 16s
Bump runc to 1.1.14 Check for merge conflicts #2069: Pull request #4967 opened by jnummelin
September 12, 2024 19:15 14s
September 12, 2024 19:15 14s
build(deps): bump helm.sh/helm/v3 from 3.15.4 to 3.16.0 Check for merge conflicts #2068: Pull request #4965 opened by dependabot bot
September 12, 2024 13:15 10s
September 12, 2024 13:15 10s
build(deps): bump google.golang.org/grpc from 1.66.0 to 1.66.2 Check for merge conflicts #2067: Pull request #4964 opened by dependabot bot
September 12, 2024 13:14 10s
September 12, 2024 13:14 10s
build(deps): bump regex from 2024.7.24 to 2024.9.11 in /docs Check for merge conflicts #2066: Pull request #4963 opened by dependabot bot
September 12, 2024 13:12 14s
September 12, 2024 13:12 14s
Enable nftables for kube-proxy Check for merge conflicts #2065: Pull request #4934 synchronize by jnummelin
September 11, 2024 20:11 12s
September 11, 2024 20:11 12s
Enable nftables for kube-proxy Check for merge conflicts #2064: Pull request #4934 synchronize by jnummelin
September 11, 2024 18:49 16s
September 11, 2024 18:49 16s
Merge pull request #4955 from twz123/fix-makefile Check for merge conflicts #2063: Commit 39c8576 pushed by twz123
September 11, 2024 16:37 2m 13s main
main
September 11, 2024 16:37 2m 13s
build(deps): bump github.com/k0sproject/k0sctl from 0.18.1 to 0.19.0 in /hack/tool Check for merge conflicts #2062: Pull request #4960 synchronize by twz123
September 11, 2024 15:00 12s
September 11, 2024 15:00 12s
Set common curl options via env in workflows Check for merge conflicts #2061: Pull request #4961 opened by ncopa
September 11, 2024 13:28 10s
September 11, 2024 13:28 10s
build(deps): bump github.com/k0sproject/k0sctl from 0.18.1 to 0.19.0 in /hack/tool Check for merge conflicts #2060: Pull request #4960 opened by dependabot bot
September 11, 2024 13:27 11s
September 11, 2024 13:27 11s
Merge pull request #4959 from jnummelin/fix/release-k0sctl-download-curl Check for merge conflicts #2059: Commit 115b3d4 pushed by jnummelin
September 11, 2024 13:24 2m 18s main
main
September 11, 2024 13:24 2m 18s
Remove bogus 'o' option which breaks newer curl from k0sctl download … Check for merge conflicts #2058: Pull request #4959 synchronize by jnummelin
September 11, 2024 12:37 12s
September 11, 2024 12:37 12s
Remove bogus 'o' option which breaks newer curl from k0sctl download … Check for merge conflicts #2057: Pull request #4959 opened by jnummelin
September 11, 2024 12:32 13s
September 11, 2024 12:32 13s
Wait until containerd is reachable when starting Check for merge conflicts #2056: Pull request #4958 synchronize by twz123
September 11, 2024 12:12 14s
September 11, 2024 12:12 14s
Merge pull request #4956 from twz123/kine-no-shared-cache Check for merge conflicts #2055: Commit f65c007 pushed by twz123
September 11, 2024 11:59 2m 11s main
main
September 11, 2024 11:59 2m 11s
Wait until containerd is reachable when starting Check for merge conflicts #2054: Pull request #4958 opened by twz123
September 11, 2024 11:40 18s
September 11, 2024 11:40 18s
Enable nftables for kube-proxy Check for merge conflicts #2053: Pull request #4934 synchronize by jnummelin
September 11, 2024 09:24 13s
September 11, 2024 09:24 13s
Enable nftables for kube-proxy Check for merge conflicts #2052: Pull request #4934 synchronize by jnummelin
September 11, 2024 09:22 15s
September 11, 2024 09:22 15s
Remove minReadySeconds from kube-router DaemonSet Check for merge conflicts #2051: Pull request #4957 opened by twz123
September 11, 2024 08:31 13s
September 11, 2024 08:31 13s
build(deps): bump google.golang.org/grpc from 1.66.0 to 1.66.1 Check for merge conflicts #2050: Pull request #4953 synchronize by dependabot bot
September 11, 2024 08:09 11s
September 11, 2024 08:09 11s
Bump github.com/Microsoft/hcsshim from 0.11.7 to 0.12.6 Check for merge conflicts #2049: Pull request #4878 synchronize by dependabot bot
September 11, 2024 08:09 13s
September 11, 2024 08:09 13s
Merge pull request #4647 from twz123/bump-kubernetes-1.31 Check for merge conflicts #2048: Commit bfcdb9d pushed by jnummelin
September 11, 2024 08:07 2m 11s main
main
September 11, 2024 08:07 2m 11s
Merge pull request #4951 from SebPlv/main Check for merge conflicts #2047: Commit c48f499 pushed by twz123
September 11, 2024 08:07 4m 10s main
main
September 11, 2024 08:07 4m 10s