diff options
| author | mh <mh@immerda.ch> | 2012-04-15 13:18:59 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-04-15 13:19:45 +0200 |
| commit | bdc244667161c3fa9140632c535921db61468800 (patch) | |
| tree | 2940f0ca9d034cdaae8136d3da68aecb407e812d /README | |
| parent | 7727549c02c97e6a20dffcbf996bce90c252c793 (diff) | |
| parent | ee33741aa1fb892cacd93d816f43093a201044a6 (diff) | |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
Diffstat (limited to 'README')
| -rw-r--r-- | README | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -19,7 +19,7 @@ This module needs: - lsb-release installed - the common module: git://labs.riseup.net/shared-common -- the concat module: https://github.com/ripienaar/puppet-concat +- the concat module: git://labs.riseup.net/shared-concat By default, on normal hosts, this module sets the configuration option DSelect::Clean to 'auto'. On virtual servers, the value is set by default to @@ -371,7 +371,7 @@ Resources ========= Concat[apt_config] ------------------------------ +------------------ Use this resource to depend on or add to a completed apt configuration |