diff options
| author | varac <varacanero@zeromail.org> | 2012-09-24 17:55:20 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-24 17:55:20 +0200 |
| commit | 48bedbcc44bc8a340c7ca6aae5fb1bba1d89e4c1 (patch) | |
| tree | 8ea9e7910dbae71a36799c94ae24628ee2c438a5 | |
| parent | 8f2c1e1cda3695426ee765c2e0afbb695e665567 (diff) | |
| parent | 53dea7cd638ebf8d353d052b2d2185940c2056b9 (diff) | |
Merge branch 'master' into openvpn
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | puppet/modules/git | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 583a5e1a..52f3d748 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "puppet/modules/ntp"] path = puppet/modules/ntp url = git://github.com/puppetlabs/puppetlabs-ntp.git +[submodule "puppet/modules/git"] + path = puppet/modules/git + url = git://code.leap.se/puppet_git diff --git a/puppet/modules/git b/puppet/modules/git new file mode 160000 +Subproject 497a1034489e0dc3cab5dab2fb0a85778576973 |