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)
commit86ec5e5e29295fb2594a7899e86cda9644b98b9a
tree2107481a9703edf9094b6652d556879b983c11e1
parent9ba37525d0ef3d144a50ed5fd4710573e92b7ec1
parent37e605f934892bf7458eecaeb01fc682e33cc2ad
Merge pull request #3094 from poettering/run-slice

systemd-run: fix --slice= in conjunction with --scope
src/core/dbus-unit.c
src/machine/machinectl.c
src/run/run.c