projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c8ae03
c23fc29
)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
author
Martin Zobel-Helas
<zobel@debian.org>
Sun, 19 Mar 2017 12:47:02 +0000
(13:47 +0100)
committer
Martin Zobel-Helas
<zobel@debian.org>
Sun, 19 Mar 2017 12:47:02 +0000
(13:47 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
Fix bacula-dir.conf template
Drop dead bits in ftp_upload
Fix portforwarder inetd config for new puppet
Trivial merge