Merge pull request #15725 from jsafrane/master-systemd-scope

Automatic merge from submit-queue (batch tested with PRs 15725, 16244, 15796, 16328, 16334) UPSTREAM: 49640: Run mount in its own systemd scope This is related to https://bugzilla.redhat.com/show_bug.cgi?id=1423640 (targeted to 3.6.x) - we need to fix 3.7 too.
openshift · Sep 15, 2017 · 682fd1b · 682fd1b
2 parents 87ceff2 + e60c023
commit 682fd1b
Show file tree

Hide file tree

Showing 4 changed files with 135 additions and 25 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/util/mount/mount.go b/vendor/k8s.io/kubernetes/pkg/util/mount/mount.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/mount/mount_linux.go b/vendor/k8s.io/kubernetes/pkg/util/mount/mount_linux.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/mount/mount_unsupported.go b/vendor/k8s.io/kubernetes/pkg/util/mount/mount_unsupported.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/mount/nsenter_mount.go b/vendor/k8s.io/kubernetes/pkg/util/mount/nsenter_mount.go