diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
| commit | 8f58a40ad81b32e1abed80485d388753deafb87b (patch) | |
| tree | 327fb24935966e567675ede5c57bb1b579c63061 /manifests/params.pp | |
| parent | f11e3d475345059220402a44a97da491c85d2b5a (diff) | |
| parent | 2e3c8fe71cec14411ccee2736f342440a7fedb92 (diff) | |
| download | puppet-apt-8f58a40ad81b32e1abed80485d388753deafb87b.tar.gz puppet-apt-8f58a40ad81b32e1abed80485d388753deafb87b.tar.bz2 | |
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
Diffstat (limited to 'manifests/params.pp')
| -rw-r--r-- | manifests/params.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index b210ff6..12273ac 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -14,4 +14,5 @@ class apt::params () { $repos = 'auto' $custom_preferences = '' $disable_update = false + $custom_key_dir = false } |