production changes

software/gitlab/software.cfg

@@ -141,7 +141,9 @@ git-executable = ${git:location}/bin/git
 <= git-repository
 repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
 # 11.11.8 + NXD patches:
-revision = v11.11.8-7-g193b94c3e2
+#revision = v11.11.8-7-g193b94c3e2
+#revision = 5ad12d614b417faaf919673bedc03c9b8cea3045
+revision = v11.11.8-10-ge6ba2a2a9b
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]

stack/slapos.cfg

@@ -117,12 +117,14 @@ eggs =
 
 [versions]
 setuptools = 44.0.0
+setuptools = 44.1.1
 # Use SlapOS patched zc.buildout
 zc.buildout = 2.7.1+slapos005
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
 # Use own version of h.r.download to be able to open .xz and .lz archives
 hexagonit.recipe.download = 1.7.post4
+zc.buildout = 2.7.1+slapos013
 
 Jinja2 = 2.9.5
 MarkupSafe = 1.0
@@ -131,7 +133,7 @@ Werkzeug = 0.12
 asn1crypto = 0.21.1
 cffi = 1.9.1
 click = 6.7
-cliff = 2.4.0
+cliff = 2.4.0:whl
 cmd2 = 0.7.0
 collective.recipe.shelloutput = 0.1
 collective.recipe.template = 2.0
@@ -162,7 +164,7 @@ slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.45
 slapos.recipe.cmmi = 0.15
 slapos.toolbox = 0.109
-stevedore = 1.21.0
+stevedore = 1.21.0:whl
 subprocess32 = 3.5.3
 unicodecsv = 0.14.1
 xml-marshaller = 1.0.2
@@ -229,6 +231,7 @@ attrs = 18.2.0
 # Required by:
 # jsonschema==3.0.0a3
 pyrsistent = 0.14.5
+pyrsistent = 0.16.1
 
 # Required by:
 # cryptography==1.8.1
@@ -236,11 +239,12 @@ ipaddress = 1.0.18
 
 # Required by:
 # slapos.cookbook==1.0.143
-jsonschema = 3.0.2
+jsonschema = 3.0.2:whl
+pytest-runner = 5.2.0:whl
 
 # Required by:
 # slapos.toolbox==0.94
-lockfile = 0.12.2
+lockfile = 0.12.2:whl
 
 # Required by:
 # slapos.core==1.5.0
@@ -269,7 +273,7 @@ pycurl = 7.43.0
 
 # Required by:
 # slapos.toolbox==0.94
-python-dateutil = 2.7.3
+python-dateutil = 2.7.3:whl
 
 # Required by:
 # slapos.toolbox==0.94