summaryrefslogtreecommitdiff
path: root/puppet/modules/site_stunnel/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-10 11:58:01 +0100
committervarac <varacanero@zeromail.org>2014-02-10 11:58:01 +0100
commit51feb301c35ede1262167dd26429fb98a9a6e65a (patch)
tree3d3bdd9c4720714e9dd8ca5c761fa9b5e3520da1 /puppet/modules/site_stunnel/manifests
parent6720bdba0c67893de713eee7f753fb582d06aa61 (diff)
parent665db30f37838bcebbfdc368f65ed369282c31b8 (diff)
Merge remote-tracking branch 'elijah/feature/known_hosts' into 4982_check_mk
Conflicts: platform.rb
Diffstat (limited to 'puppet/modules/site_stunnel/manifests')
0 files changed, 0 insertions, 0 deletions