err.no Git - systemd/commit

]> err.no Git - systemd/commit

author	Lennart Poettering <lennart@poettering.net>
	Mon, 9 Aug 2010 20:32:30 +0000 (22:32 +0200)
committer	Lennart Poettering <lennart@poettering.net>
	Mon, 9 Aug 2010 20:32:30 +0000 (22:32 +0200)
commit	69dd2852bb2c433b517d89792adb4461a4178aa1
tree	f303fd9de62719c117a68c336bac5999ead3a3af	tree \| snapshot
parent	6e98720f14dc25ee1d43f951d5c4d79b04ad7506	commit \| diff

manager: when two pending jobs conflict, keep the one that "conflicts", remove the one that is "conflicted"

This gives the writer of units control which unit is kept and which is
stopped when two units conflict.

17 files changed:

fixme		diff \| blob \| history
man/systemd.unit.xml		diff \| blob \| history
man/systemd.xml		diff \| blob \| history
src/automount.c		diff \| blob \| history
src/dbus-unit.h		diff \| blob \| history
src/job.c		diff \| blob \| history
src/job.h		diff \| blob \| history
src/manager.c		diff \| blob \| history
src/mount.c		diff \| blob \| history
src/path.c		diff \| blob \| history
src/service.c		diff \| blob \| history
src/socket.c		diff \| blob \| history
src/systemctl.c		diff \| blob \| history
src/timer.c		diff \| blob \| history
src/unit.c		diff \| blob \| history
src/unit.h		diff \| blob \| history
units/graphical.target.m4		diff \| blob \| history

systemd, git://git.err.no/systemd

RSS Atom