Jérôme Charaoui 53c49fe2ae Merge branch 'merge_debian_preferences_templates' ... Conflicts: manifests/preferences.pp templates/Debian/preferences_jessie.erb templates/Debian/preferences_squeeze.erb templates/Debian/preferences_wheezy.erb		2016-06-29 16:35:17 +02:00
..
Debian	Merge branch 'merge_debian_preferences_templates'	2016-06-29 16:35:17 +02:00
Ubuntu	Merge branch 'support_missing_ubuntu_releases' into 'master'	2015-12-04 21:27:26 +00:00
20proxy.erb	address puppet 3.x deprecation warnings	2014-04-18 10:59:26 +02:00
50unattended-upgrades.erb	Improve unattended-upgrades origin selectors	2015-10-09 16:39:19 -04:00
preferences_snippet.erb	address puppet 3.x deprecation warnings	2014-04-18 10:59:26 +02:00
preferences_snippet_release.erb	address puppet 3.x deprecation warnings	2014-04-18 10:59:26 +02:00