Commit 43ecbba7 authored by Kasra Jamshidi's avatar Kasra Jamshidi

Merge branch 'master' of https://lab.nexedi.com/nexedi/slapos

parents ad92029e 0d90b242
...@@ -10,8 +10,8 @@ parts = ...@@ -10,8 +10,8 @@ parts =
[openvpn] [openvpn]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://swupdate.openvpn.org/community/releases/openvpn-2.3.12.tar.xz url = https://swupdate.openvpn.org/community/releases/openvpn-2.3.14.tar.xz
md5sum = 63326bab2ebb9efe3c7becaa4f15e1c1 md5sum = 70fc1e9c74ba2e6d7f7e320313dc3a7b
configure-options = configure-options =
--disable-dependency-tracking --disable-dependency-tracking
--disable-plugin-auth-pam --disable-plugin-auth-pam
......
...@@ -46,6 +46,7 @@ eggs = neoppod[admin, ctl, master, storage-mysqldb] ...@@ -46,6 +46,7 @@ eggs = neoppod[admin, ctl, master, storage-mysqldb]
BTrees BTrees
ZODB ZODB
zope.testing zope.testing
zodbtools
[slapos-deps-eggs] [slapos-deps-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -111,6 +112,7 @@ persistent = 4.2.2 ...@@ -111,6 +112,7 @@ persistent = 4.2.2
transaction = 1.7.0 transaction = 1.7.0
zdaemon = 4.1.0 zdaemon = 4.1.0
zodbpickle = 0.6.0 zodbpickle = 0.6.0
zodbtools = 0.0.0.dev3
# Required by slapos.toolbox = 0.61 # Required by slapos.toolbox = 0.61
slapos.toolbox = 0.61 slapos.toolbox = 0.61
PyRSS2Gen = 1.1 PyRSS2Gen = 1.1
......
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