]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #3094 from poettering/run-slice
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 22 Apr 2016 18:04:38 +0000 (14:04 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 22 Apr 2016 18:04:38 +0000 (14:04 -0400)
systemd-run: fix --slice= in conjunction with --scope

1  2 
src/core/dbus-unit.c
src/machine/machinectl.c
src/run/run.c

Simple merge
Simple merge
diff --cc src/run/run.c
Simple merge