Merge branch 'trac'

software/trac-svn/software.cfg

 [buildout]
 
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
+#develop =
+#  ${:parts-directory}/slapos.cookbook-repository
 #  ${trac-plugins-egg:location}/accountmanager
 
 parts = 
@@ -24,8 +24,8 @@ parts =
   template-git-http-backend-cgi
 #  trac-plugins-egg
 #  check-egg
-  slapos.cookbook-repository
-  check-recipe
+#  slapos.cookbook-repository
+#  check-recipe
 
 extends =
   ../../stack/slapos.cfg
@@ -179,8 +179,9 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 #   Cedric de Saint Martin
 #   Yingjie Xu
 #   Gabriel Monnerat
-#   Łukasz Nowak
+#   Łukasz Nowak
 #   Test Agent (Automatic update from tests)
+#   Alain Takoudjou
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -286,11 +287,24 @@ signature-certificate-list =
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJANlTfgX/9cX7MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+  BAMMBkNPTVAtMDAgFw0xMzA1MzAxMTUyMDhaGA8yMTEzMDUwNjExNTIwOFowETEP
+  MA0GA1UEAwwGQ09NUC0wMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSGtkh
+  UPOcYMRiL2czmdfeHNB34nXEr5fMpglbA9RO9Cakf6YhK0jU5Y7kzAb6ZlyEzcC+
+  YkYWQZ9WCLwGuUvThg5iYlnBxmksv5Ot+5DKyTL4hdMEPCQ0RaLcXSkbxk56q3Rn
+  EQdYL+IJXS1KGMRWbl4Ql3NhShM9q7vBgyoMuwIDAQABo1AwTjAdBgNVHQ4EFgQU
+  EpO2oyW/sFAS9eojDbYo3hEOOIIwHwYDVR0jBBgwFoAUEpO2oyW/sFAS9eojDbYo
+  3hEOOIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBP02wmekqmeD23
+  90NmwDwyEznDPEJDJybREtP+T++EJ1Q/rcnxIQ5a1iOEWY4RdH87H/+2O/7nDzGs
+  L0KzeG3WDdmnxLMQ5zpG9Qd5twC0GoMl1zf+8f9/t4QE7Dn4IosP3H3dkcRDQRch
+  SKYaJZHMckKx40/hhRsyFDR1Gj215g==
+  -----END CERTIFICATE-----
 
 [versions]
 #Error: Couldn't install: lxml 3.1.2
 lxml = 3.1.1
-
+lock-file = 2.0
 Genshi = 0.7
 Jinja2 = 2.6
 MySQL-python = 1.2.4
@@ -304,6 +318,7 @@ collective.recipe.cmd = 0.6
 docutils = 0.10
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 2.0
+slapos.recipe.cmmi = 0.1.1
 inotifyx = 0.2.0
 meld3 = 0.6.10
 netaddr = 0.7.10
@@ -315,6 +330,7 @@ slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.34.0
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
+slapos.cookbook = 0.78.1
 
 # Required by:
 # slapos.core==0.35.1
@@ -351,7 +367,7 @@ pyflakes = 0.7.1
 
 # Required by:
 # hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.76.1.dev
+# slapos.cookbook==0.78.1
 # slapos.core==0.35.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010