projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ede01e5
7111c04
)
Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'
author
Martin Zobel-Helas
<zobel@debian.org>
Mon, 10 Apr 2017 15:11:09 +0000
(17:11 +0200)
committer
Martin Zobel-Helas
<zobel@debian.org>
Mon, 10 Apr 2017 15:11:09 +0000
(17:11 +0200)
* waldi/vsftpd-systemd-upload:
Use vsftpd via systemd on security_master
Use vsftpd via systemd on ftp_upload
Make sure xinetd is restarted on service removal
Trivial merge