Merge remote-tracking branch 'telmich/master'

10 years ago · d2dd706a1a
parent c3bf4c7b61 56e51f834f
commit d2dd706a1a
2 changed files with 3 additions and 0 deletions
--- a/cdist/conf/type/__apt_norecommends/manifest
+++ b/cdist/conf/type/__apt_norecommends/manifest
@ -30,6 +30,8 @@ case "$os" in
         --source - << DONE
 APT::Install-Recommends "0";
 APT::Install-Suggests "0";
 APT::AutoRemove::RecommendsImportant "0";
 APT::AutoRemove::SuggestsImportant "0";
 DONE
   ;;
   *)
--- a/docs/changelog
+++ b/docs/changelog
@ -8,6 +8,7 @@ next:
 	* Type __consul: Do not install unused package unzip (Steven Armstrong)
 	* Type __consul: Add source & cksum for 0.5.2 (Steven Armstrong)
 	* Core: Support object ids '.cdist' (Nico Schottelius)
 	* Type __apt_norecommends: Also setup autoremove options (Dmitry Bogatov)
 3.1.13: 2015-05-16