From: intrigeri <intrigeri@boum.org>
Date: Mon, 14 Feb 2011 16:17:31 +0000 (+0100)
Subject: Merge remote branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2f7903bcc4b27ebe4098fb91c14098521da8dd7a;p=puppet-sshd.git

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.
---

2f7903bcc4b27ebe4098fb91c14098521da8dd7a