aboutsummaryrefslogtreecommitdiff
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorAntoine Beaupré <anarcat@koumbit.org>2015-04-17 14:47:03 -0400
committerAntoine Beaupré <anarcat@koumbit.org>2015-04-17 14:47:03 -0400
commite9596d0f6d243ae00bb5b360a5c37bed577c5438 (patch)
treeea8e120b7d7ef84ba71391f39870092e43391627 /lib/puppet/parser
parentd4923b2c3ad74d813a9a2e5b39b6fa171ee95bc0 (diff)
parente2cad38276c2d2f0c952a5c2d2d0f9491e977961 (diff)
downloadpuppet-sshd-e9596d0f6d243ae00bb5b360a5c37bed577c5438.tar.gz
puppet-sshd-e9596d0f6d243ae00bb5b360a5c37bed577c5438.tar.bz2
Merge remote-tracking branch 'micah/remove_etch' into shared
Conflicts: templates/sshd_config/Debian_etch.erb
Diffstat (limited to 'lib/puppet/parser')
0 files changed, 0 insertions, 0 deletions