summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-09-24 17:46:51 +0200
committervarac <varacanero@zeromail.org>2012-09-24 17:46:51 +0200
commit8f2c1e1cda3695426ee765c2e0afbb695e665567 (patch)
tree5055717d9c7d6a7afc9d0e14c3d2bb617e2582bf /puppet
parentf003f3525454caef7e70b27ccf7ca2c1408213d5 (diff)
parent3fc154d5b495338b7cce2971a0fba2c4faef4ee2 (diff)
Merge branch 'master' into openvpn
Diffstat (limited to 'puppet')
m---------puppet/modules/lsb0
m---------puppet/modules/ntp9
2 files changed, 9 insertions, 0 deletions
diff --git a/puppet/modules/lsb b/puppet/modules/lsb
new file mode 160000
+Subproject 3742c1a00c5602154a81834443ec5b0ca32c4ca
diff --git a/puppet/modules/ntp b/puppet/modules/ntp
new file mode 160000
+Subproject 27f2bc72110b1001233eb0907aa07e06cdf3319