Commit 876234be authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into x/gitlab

* master:
  slapos-testing: slapos.package moved to GitLab
  *: slapos.recipe.* moved to GitLab
  userhosts: Moved to GitLab
  manpy: Dream moved to GitLab
  cloudooo: Moved to GitLab
  *: slapos.toolbox moved to GitLab
parents c4ed790d 35c32956
...@@ -11,7 +11,7 @@ setup = ${cloudooo-repository:location} ...@@ -11,7 +11,7 @@ setup = ${cloudooo-repository:location}
[cloudooo-repository] [cloudooo-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/cloudooo.git repository = https://lab.nexedi.com/nexedi/cloudooo.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -11,7 +11,7 @@ parts = ...@@ -11,7 +11,7 @@ parts =
[dream-repository.git] [dream-repository.git]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/dream.git repository = https://lab.nexedi.com/nexedi/dream.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true develop = true
......
...@@ -12,7 +12,7 @@ location = ${userhosts-get:location}/userhosts ...@@ -12,7 +12,7 @@ location = ${userhosts-get:location}/userhosts
[userhosts-get] [userhosts-get]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/userhosts.git repository = https://lab.nexedi.com/nexedi/userhosts.git
revision = d3080ad4b82c91dc14fd2ad2a8e9b2512e600c2a revision = d3080ad4b82c91dc14fd2ad2a8e9b2512e600c2a
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
location = ${buildout:parts-directory}/userhosts location = ${buildout:parts-directory}/userhosts
...@@ -26,7 +26,7 @@ git-executable = ${git:location}/bin/git ...@@ -26,7 +26,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = agent3 branch = agent3
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git ...@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git ...@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -19,7 +19,7 @@ git-executable = ${git:location}/bin/git ...@@ -19,7 +19,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -19,7 +19,7 @@ git-executable = ${git:location}/bin/git ...@@ -19,7 +19,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -30,7 +30,7 @@ git-executable = ${git:location}/bin/git ...@@ -30,7 +30,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -54,19 +54,19 @@ repository = https://lab.nexedi.com/nexedi/slapos.core.git ...@@ -54,19 +54,19 @@ repository = https://lab.nexedi.com/nexedi/slapos.core.git
[slapos.package-repository] [slapos.package-repository]
<= git-clone-repository <= git-clone-repository
repository = http://git.erp5.org/repos/slapos.package.git repository = https://lab.nexedi.com/nexedi/slapos.package.git
[slapos.recipe.template-repository] [slapos.recipe.template-repository]
<= git-clone-repository <= git-clone-repository
repository = http://git.erp5.org/repos/slapos.recipe.template.git repository = https://lab.nexedi.com/nexedi/slapos.recipe.template.git
[slapos.recipe.build-repository] [slapos.recipe.build-repository]
<= git-clone-repository <= git-clone-repository
repository = http://git.erp5.org/repos/slapos.recipe.build.git repository = https://lab.nexedi.com/nexedi/slapos.recipe.build.git
[slapos.recipe.cmmi-repository] [slapos.recipe.cmmi-repository]
<= git-clone-repository <= git-clone-repository
repository = http://git.erp5.org/repos/slapos.recipe.cmmi.git repository = https://lab.nexedi.com/nexedi/slapos.recipe.cmmi.git
[erp5-util-repository] [erp5-util-repository]
<= git-clone-repository <= git-clone-repository
......
...@@ -22,7 +22,7 @@ develop = ...@@ -22,7 +22,7 @@ develop =
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -28,7 +28,7 @@ develop = ...@@ -28,7 +28,7 @@ develop =
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
...@@ -46,7 +46,7 @@ git-executable = ${git:location}/bin/git ...@@ -46,7 +46,7 @@ git-executable = ${git:location}/bin/git
[slapos.recipe.maarch-repository] [slapos.recipe.maarch-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.recipe.maarch.git repository = https://lab.nexedi.com/nexedi/slapos.recipe.maarch.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -25,7 +25,7 @@ develop = ...@@ -25,7 +25,7 @@ develop =
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git ...@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -26,7 +26,7 @@ develop = ...@@ -26,7 +26,7 @@ develop =
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment