Merge remote-tracking branch 'upstream/master'

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.2f.tar.gz
-md5sum = b3bf73f507172be9292ea2a8c28b659d
+url = https://www.openssl.org/source/openssl-1.0.2g.tar.gz
+md5sum = f3c710c045cdee5fd114feb69feba7aa
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with INSTALL_PREFIX). Used by slapos.package.git/obs

software/agent/software.cfg

@@ -48,29 +48,29 @@ gitdb = 0.6.4
 pycrypto = 2.6.1
 slapos.recipe.download = 1.0
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.53
+slapos.toolbox = 0.55
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 GitPython = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 lockfile = 0.10.2
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 paramiko = 1.16.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 rpdb = 0.1.5

software/apache-frontend/software.cfg

@@ -11,29 +11,29 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.53
+slapos.toolbox = 0.55
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox==0.52
+# slapos.toolbox==0.55
 GitPython = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.52
+# slapos.toolbox==0.55
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.52
+# slapos.toolbox==0.55
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox==0.52
+# slapos.toolbox==0.55
 lockfile = 0.10.2
 
 # Required by:
-# slapos.toolbox==0.52
+# slapos.toolbox==0.55
 paramiko = 1.16.0
 
 # Required by:
-# slapos.toolbox==0.52
+# slapos.toolbox==0.55
 rpdb = 0.1.5

software/gitlab/software.cfg

@@ -111,7 +111,7 @@ git-executable = ${git:location}/bin/git
 [gitlab-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-repository = https://lab.nexedi.com/kirr/gitlab-ce.git
+repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
 # 8.5.X + NXD patches:
 revision = v8.5.1-15-g5d6b7eba1ed4540ef4908783eddf1eef9c3ec74d
 location = ${buildout:parts-directory}/gitlab
@@ -119,7 +119,7 @@ location = ${buildout:parts-directory}/gitlab
 [gitlab-shell-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-shell.git
-repository = https://lab.nexedi.com/kirr/gitlab-shell.git
+repository = https://lab.nexedi.com/nexedi/gitlab-shell.git
 # gitlab 8.5 wants gitlab-shell 2.6.10
 # 2.6.10 + no-hooks.old patch
 revision = v2.6.10-13-gcb8f331c955aa780efe10263d0d45b332f030f42
@@ -128,7 +128,7 @@ location = ${buildout:parts-directory}/gitlab-shell
 [gitlab-workhorse-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git
-repository = https://lab.nexedi.com/kirr/gitlab-workhorse.git
+repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
 # 0.6.4 + NXD patches for blob download speedup
 # (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/17)
 revision = 0.6.4-2-g86b2a17f24f6c369774bbb388560e4aa9a4321c1

software/monitor/software.cfg

@@ -109,30 +109,30 @@ apache-libcloud = 0.16.0
 ecdsa = 0.11
 gitdb = 0.6.0
 pycrypto = 2.6.1
-slapos.toolbox = 0.53
+slapos.toolbox = 0.55
 smmap = 0.8.3
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 GitPython = 0.3.2.1
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 feedparser = 5.1.3
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 paramiko = 1.16.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 lockfile = 0.10.2
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 rpdb = 0.1.5
 

software/neoppod/software-common.cfg

@@ -113,8 +113,8 @@ md5sum = febd3ed58043ce1367b86cf6e4e69700
 slapos.recipe.template = 2.9
 # patched egg
 ZODB3 = 3.10.5+SlapOSPatched001
-# Required by slapos.toolbox==0.52
-slapos.toolbox = 0.53
+# Required by slapos.toolbox==0.55
+slapos.toolbox = 0.55
 apache-libcloud = 0.20.1
 atomize = 0.2.0
 ecdsa = 0.13

software/re6stnet/software.cfg

@@ -110,15 +110,15 @@ gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 slapos.recipe.template = 2.7
-slapos.toolbox = 0.53
+slapos.toolbox = 0.55
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 GitPython = 0.3.6
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 atomize = 0.2.0
 
 # Required by:
@@ -126,11 +126,11 @@ atomize = 0.2.0
 backports.ssl-match-hostname = 3.4.0.2
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 feedparser = 5.1.3
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 lockfile = 0.10.2
 
 # Required by:
@@ -138,10 +138,10 @@ lockfile = 0.10.2
 miniupnpc = 1.9
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 paramiko = 1.16.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 rpdb = 0.1.5
 

software/slaprunner/software.cfg

@@ -19,25 +19,25 @@ gunicorn = 19.4.5
 prettytable = 0.7.2
 pycrypto = 2.6.1
 slapos.recipe.template = 2.9
-slapos.toolbox = 0.53
+slapos.toolbox = 0.55
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 GitPython = 1.0.2
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 lockfile = 0.10.2
 
 # Required by:
-# slapos.toolbox==0.53
+# slapos.toolbox==0.55
 paramiko = 1.16.0

stack/slapos.cfg

@@ -115,7 +115,7 @@ cffi = 1.5.2
 cliff = 2.0.0
 cmd2 = 0.6.8
 collective.recipe.template = 1.13
-cryptography = 1.2.2
+cryptography = 1.2.3
 decorator = 4.0.9
 idna = 2.0
 inotifyx = 0.2.2