diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:31:42 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:31:42 +0100 |
| commit | d30069c178ff2aff9154f65bd7dbf988c4d002f1 (patch) | |
| tree | c710585866e623dd595b35bc921261a364ec64c8 /lib/puppet/parser | |
| parent | ee6d13d1e42acca7374aa302a4f9dfa9001d799f (diff) | |
| parent | d97a49b7b2c020c2c43df6524236f50a421789ee (diff) | |
| download | puppet-apt-d30069c178ff2aff9154f65bd7dbf988c4d002f1.tar.gz puppet-apt-d30069c178ff2aff9154f65bd7dbf988c4d002f1.tar.bz2 | |
Merge commit 'd97a49b7b2c020c2c43df6524236f50a421789ee'.
Going on merging immerda changes.
Incompatible change: I do prefer my own generic apt/preferences template to
shipping a static file that only supports Lenny. My own template supports
security, backports, volatile, next release etc.
Conflicts:
files/preferences
manifests/init.pp
manifests/preferences.pp
Diffstat (limited to 'lib/puppet/parser')
0 files changed, 0 insertions, 0 deletions