diff options
| author | mh <mh@immerda.ch> | 2012-08-16 09:35:21 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-08-16 09:35:21 +0200 |
| commit | 0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262 (patch) | |
| tree | 55e38dde8d7f0fce7a08fb39774084e724e1a2e3 /manifests/proxy_client.pp | |
| parent | f823fcd5b7408d7d690cfc5c5063e28db06271a4 (diff) | |
| parent | 4f433dbd5238e6b5211d3b0f240ff58031c3da2b (diff) | |
| download | puppet-apt-0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262.tar.gz puppet-apt-0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262.tar.bz2 | |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
manifests/dist_upgrade/initiator.pp
manifests/init.pp
manifests/preseeded_package.pp
manifests/unattended_upgrades.pp
Diffstat (limited to 'manifests/proxy_client.pp')
0 files changed, 0 insertions, 0 deletions