Switch to dedicated branches for slapos master

software/slapos-master/software.cfg

@@ -25,13 +25,13 @@ repository_id_list = erp5 vifib/master
 [erp5]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
-branch = master
+branch = erp5-slapos-upgrade
 git-executable = ${git:location}/bin/git
 
 [vifib]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
+branch = operation-control
 git-executable = ${git:location}/bin/git
 
 [vifib-fix-products-paths]
@@ -87,6 +87,11 @@ python-memcached = 1.47
 facebook-sdk = 0.4.0
 google-api-python-client = 1.2
 
+# stick to Zope 2.12.22 because Zope 2.12.23's
+# ObjectManager.__getitem__ is much slower for a module having lots of
+# sub objects.
+#XX Zope2 = 2.12.22
+
 [networkcache]
 # signature certificates of the following uploaders.
 #   Romain Courteaud