Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Rebase 4.19.69 patches onto 4.19.71 #356

Merged
merged 4 commits into from
Sep 6, 2019
Merged

Rebase 4.19.69 patches onto 4.19.71 #356

merged 4 commits into from
Sep 6, 2019

Conversation

coreosbot
Copy link

Vito Caputo and others added 4 commits September 6, 2019 22:37

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
This enables relocating source and build trees to different roots,
provided they stay reachable relative to one another.  Useful for
builds done within a sandbox where the eventual root is prefixed
by some undesirable path component.
kube-proxy won't enable ipvs unless it can modprobe nf_conntrack_ipv4 and
find it in the list of loaded modules afterward.  Thus an alias isn't
enough to maintain compatibility; we need an actual module.
This is accidentally triggered by multiple versions of Docker.  Drop
the test pending a Docker fix.

Reverts part of 0319ef1.

moby/moby#39475
@bgilbert bgilbert merged commit 743dff5 into coreos:v4.19.71-coreos Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants