projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c8ae03 c23fc29)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Mar 2017 12:47:02 +0000 (13:47 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Mar 2017 12:47:02 +0000 (13:47 +0100)
commit7078770bf6bf50fecb8dac96388fbecaa93a8e9f
tree46bb038d57297512458877ec31816ac6d350c492tree | snapshot
parent9c8ae03b583c01e47b4b5bbf091efcd4302fc1e7commit | diff
parentc23fc29eda43c486841c3261d07884180dc657f2commit | diff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* '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
Unnamed repository; edit this file 'description' to name the repository.