diff options
| author | varac <varacanero@zeromail.org> | 2012-09-24 17:46:51 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-24 17:46:51 +0200 |
| commit | 8f2c1e1cda3695426ee765c2e0afbb695e665567 (patch) | |
| tree | 5055717d9c7d6a7afc9d0e14c3d2bb617e2582bf | |
| parent | f003f3525454caef7e70b27ccf7ca2c1408213d5 (diff) | |
| parent | 3fc154d5b495338b7cce2971a0fba2c4faef4ee2 (diff) | |
Merge branch 'master' into openvpn
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | puppet/modules/lsb | 0 | ||||
| m--------- | puppet/modules/ntp | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index c3e82a04..583a5e1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "puppet/modules/apt"] path = puppet/modules/apt url = git://code.leap.se/puppet_apt +[submodule "puppet/modules/lsb"] + path = puppet/modules/lsb + url = git://labs.riseup.net/shared-lsb +[submodule "puppet/modules/ntp"] + path = puppet/modules/ntp + url = git://github.com/puppetlabs/puppetlabs-ntp.git 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 |