Merge branch 'security-upload-host' of https://github.com/aburch/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Fri, 1 Sep 2017 19:42:33 +0000 (21:42 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 1 Sep 2017 19:42:33 +0000 (21:42 +0200)
commitc1733e79066aa423543e909484463fa887d2975d
tree154fe4894f63d3a31c8d6bf4a69975b10e90fb14
parent939f84bf4e310bcc482ba7c5f081c4580b377252
parentcb406afb7d640308d5fc9b25fef6f8512d8e24b6
Merge branch 'security-upload-host' of https://github.com/aburch/dsa-puppet