summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2013-09-14 11:17:40 +0200
committerkwadronaut <kwadronaut@leap.se>2013-09-14 11:17:40 +0200
commit42137d40f6ff5061c1f453f8acafc457c69ff477 (patch)
treeb143fe33bdd1aa6b6362089e0941db09c4146dad
parent2e1ec38fa4333db7a36b8036207a8f959410bd9d (diff)
parenta27a46af184331c2b6dab4a0ead4f7a77de713df (diff)
Merge branch 'vcs_module' into develop
-rw-r--r--.gitmodules6
m---------puppet/modules/vcsrepo0
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index a160d379..070cb517 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,9 +37,6 @@
[submodule "puppet/modules/bundler"]
path = puppet/modules/bundler
url = https://leap.se/git/puppet_bundler
-[submodule "puppet/modules/vcsrepo"]
- path = puppet/modules/vcsrepo
- url = git://labs.riseup.net/module_vcs
[submodule "puppet/modules/rubygems"]
path = puppet/modules/rubygems
url = https://leap.se/git/puppet_rubygems
@@ -79,3 +76,6 @@
[submodule "puppet/modules/postfix"]
path = puppet/modules/postfix
url = https://leap.se/git/puppet_postfix
+[submodule "puppet/modules/vcsrepo"]
+ path = puppet/modules/vcsrepo
+ url = https://leap.se/git/puppet_vcsrepo
diff --git a/puppet/modules/vcsrepo b/puppet/modules/vcsrepo
-Subproject 4db1120c78763f5244dc6c9d2e0d064a6ef363e
+Subproject f92d09226cfddb0c7e5e342dd199d8ea05b497c