diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 10:17:30 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 10:17:30 -0300 |
| commit | ff79bc6295e9f089285ccc26c04cc72893a8384f (patch) | |
| tree | 1a84dad2d03bc3814305eeaedb4cfd8d8dc09f36 /spec/unit/parser/functions/git@git.fluxo.info:puppet-sshd | |
| parent | 9b1d0f06fee4b0c457d0154c4153415758c10425 (diff) | |
| parent | 672b0985d1c2acfde58fecc4c635517522c86268 (diff) | |
| download | puppet-sshd-ff79bc6295e9f089285ccc26c04cc72893a8384f.tar.gz puppet-sshd-ff79bc6295e9f089285ccc26c04cc72893a8384f.tar.bz2 | |
Merge branch 'master' of https://gitlab.com/shared-puppet-modules-group/sshd
Conflicts:
README
templates/sshd_config/CentOS.erb
templates/sshd_config/CentOS_Final.erb
templates/sshd_config/Debian_etch.erb
templates/sshd_config/Debian_jessie.erb
templates/sshd_config/Debian_sid.erb
templates/sshd_config/Debian_squeeze.erb
templates/sshd_config/Debian_wheezy.erb
templates/sshd_config/Ubuntu_trusty.erb
Diffstat (limited to 'spec/unit/parser/functions/git@git.fluxo.info:puppet-sshd')
0 files changed, 0 insertions, 0 deletions