Merge branch 'master' of git://labs.riseup.net/shared-apt
Merge remote-tracking branch 'riseup/feature/unknown_lsbdistcodename'
added custom fact apt_running
Merge remote-tracking branch 'remotes/shared/master'
Install unattended-upgrades after Exec[refresh_apt]

Before, including apt::unattended_upgrades on a host without
the unattended-upgrades package would fail on the first run,
because the module tries to install the package before apt is
finally configured.
This commit does:

- introduce the option $refresh_apt for apt::apt_conf
  (Defaults to true). Can be used to not trigger Exec['refresh_apt']
- install the unattended-upgrades package after a final
  Exec['refresh_apt']. To not run into a loop, it calls
  Apt_conf['50unattended-upgrades'] with the option
  refresh_apt => false, which is also not needed for the configuration
apt keys: always deploy before Exec[refresh_apt], also with $custom_preferences
deploy /etc/apt/preferences before File['apt_config']
Revert "deploy /etc/apt/preferences before File['apt_config']"

This reverts commit 7e8113b3fcf6f251ca9d5e2f39f43fd024058c97.

see https://leap.se/code/issues/1990 for the miserious details.
Merge branch 'master' into leap
fix for the following: warning: Dynamic lookup of $custom_preferences at modules/apt/manifests/preferences_snippet.pp:16 is deprecated. For more information, see http://docs.puppetlabs.com/guides/scope_and_puppet.html. To see the change in behavior, use the --debug flag.
remove unnecessary before dependency on the /etc/apt/preferences file in unattended_upgrades.pp
Make custom_key_dir a class parameter and not a global variable

Conflicts:
	manifests/init.pp
fix default unattended-upgrades config file
using distribution sprecific files again
fix unattended-upgrades dependency cycle
Updating unattended-upgrades squeeze config as oldstable (2)
Changing 'testing' to 'wheezy' on 50unattended-upgrades.wheezy
Regression: lost MailOnlyOnError for unattended-upgrades

Since only wheezy supports it, let's add it back only for wheezy.

Signed-off-by: Gabriel Filion <gabster@lelutin.ca>
Merge branch 'bug/fix_push' into leap

This gets us fixes for the unattended_upgrades in wheezy, as well as the custom_key_dir class parameter replacement of the global variable
Conflicts:
	manifests/unattended_upgrades.pp
remove unnecessary override and accidentally merge issue