diff options
| author | intrigeri <intrigeri@boum.org> | 2011-02-14 17:17:31 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2011-02-14 17:17:31 +0100 |
| commit | 2f7903bcc4b27ebe4098fb91c14098521da8dd7a (patch) | |
| tree | 5b0268ee2f39a39b8fdf5fd566f3c13a58f3ebde /files/modules_dir/.ignore | |
| parent | 7c046e3fdf9a4bc4558290205de57df39e86ac70 (diff) | |
| parent | 2188f46db75d74d00ac4a2cb3cdaa34f98d1148d (diff) | |
| download | puppet-sshd-2f7903bcc4b27ebe4098fb91c14098521da8dd7a.tar.gz puppet-sshd-2f7903bcc4b27ebe4098fb91c14098521da8dd7a.tar.bz2 | |
Merge remote branch 'shared/master'
Conflicts:
templates/sshd_config/Debian_squeeze.erb
I always picked the shared repository version when conflicts arose.
The only exception to this rule was:
I kept my branch's "HostbasedUsesNameFromPacketOnly yes" in order
to be consistent with existing Etch and Lenny templates.
This is not the default Debian setting, but I would find it weird if a host
had this setting changed by Puppet after upgrading to Squeeze.
The right way to proceed would probably be to make this configurable.
Diffstat (limited to 'files/modules_dir/.ignore')
0 files changed, 0 insertions, 0 deletions