]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge remote-tracking branch 'shared/master' into develop develop master
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 31 Mar 2016 17:50:07 +0000 (14:50 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 31 Mar 2016 17:50:07 +0000 (14:50 -0300)
commitb65996f7ae03d2bae118855a3c4d94a3947e556d
tree5bab8e5c3663aaabca34ebcee3c706c4fbc35cb5
parentb0425c65ecc61c6af3f31fba577b1e1c5d880674
parent8c8bd7bb1e5cc0f5297db9629ece783452233d1f
Merge remote-tracking branch 'shared/master' into develop

Conflicts:
README
files/Debian/50unattended-upgrades.lenny
files/Debian/50unattended-upgrades.wheezy
manifests/init.pp
manifests/params.pp
manifests/unattended_upgrades.pp
templates/Debian/preferences_jessie.erb
templates/Debian/sources.list.erb