[Erp5-report] r42601 rafael - in /erp5/release/candidate: instance-profiles/ profiles/ soft...

[nobody at svn.erp5.org]

Author: rafael
Date: Fri Jan 21 19:38:08 2011
New Revision: 42601

URL: http://svn.erp5.org?rev=42601&view=rev
Log:
Merge recently changes:

 * 42512 (rafael) This file is not required anymore. The Release should introduce his own .cfg after become a candidate.
 * 42539 (rafael) Use cloudooo.cfg instead oood.cfg
 * 42540 (rafael) Use slapos.tool.networkcache extension by default. This extension requires you define network-cache to make it work. If network-cache is not defined, the previous behaviour for download is preserved.
 * 42541 (rafael) Added configuration:oood_port to provide backward compatibility with testrunner.cfg.
 * 42542 (rafael) Partially revert r42427. This modifies where mysql command is created, and break appliance tests.
 * 42544 (kazuhiko) modify the URL of the patch, because varnish developers are now using git.
 * 42566 (rafael) Use recently version of slapos.tool.networkcache due a bug when network cache is not defined.
 * 42579 (rafael) Use more recent version.
 * 42583 (rafael) Fix typo.

Modified:
    erp5/release/candidate/instance-profiles/cloudooo.cfg
    erp5/release/candidate/instance-profiles/mysql.cfg
    erp5/release/candidate/profiles/deployment.cfg
    erp5/release/candidate/profiles/software-common.cfg
    erp5/release/candidate/profiles/versions-common.cfg
    erp5/release/candidate/software-profiles/varnish.cfg

Modified: erp5/release/candidate/instance-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/release/candidate/instance-profiles/cloudooo.cfg?rev=42601&r1=42600&r2=42601&view=diff
==============================================================================
--- erp5/release/candidate/instance-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/release/candidate/instance-profiles/cloudooo.cfg [utf8] Fri Jan 21 19:38:08 2011
@@ -11,6 +11,9 @@ parts =
   create-log-directory
   supervisor-instance
 
+[configuration]
+oood_port = 8011
+
 [paster]
 recipe = zc.recipe.egg
 eggs =
@@ -56,7 +59,7 @@ virtual-display-port = 6077
 virtual-display-id = 77
 virtual-screen = 0
 server-hostname = 0.0.0.0
-server-port = 8011
+server-port = ${configuration:oood_port}
 supervisor-priority = 30
 supervisor-program =
   ${:supervisor-priority} ${:_buildout_section_name_} (stopsignal=HUP) ${buildout:bin-directory}/paster [serve ${cloudooo-instance:conf-output}]

Modified: erp5/release/candidate/instance-profiles/mysql.cfg
URL: http://svn.erp5.org/erp5/release/candidate/instance-profiles/mysql.cfg?rev=42601&r1=42600&r2=42601&view=diff
==============================================================================
--- erp5/release/candidate/instance-profiles/mysql.cfg [utf8] (original)
+++ erp5/release/candidate/instance-profiles/mysql.cfg [utf8] Fri Jan 21 19:38:08 2011
@@ -19,6 +19,7 @@ depends =
   ${create-directories:command}
 recipe = erp5.recipe.mysqlserver
 mysql_software_bin = ${software_definition:mysql_software}/bin
+mysql_bin_folder =  ${buildout:data-bin-directory}
 mysql_software_libexec = ${software_definition:mysql_software}/libexec
 mysql_datadir = ${configuration:mysql_datadir}
 mysql_auto_start = false

Modified: erp5/release/candidate/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/deployment.cfg?rev=42601&r1=42600&r2=42601&view=diff
==============================================================================
--- erp5/release/candidate/profiles/deployment.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/deployment.cfg [utf8] Fri Jan 21 19:38:08 2011
@@ -10,7 +10,7 @@ extends =
   ../instance-profiles/mysql-database.cfg
   ../instance-profiles/mysql.cfg
   ../instance-profiles/sphinx.cfg
-  ../instance-profiles/oood.cfg
+  ../instance-profiles/cloudooo.cfg
   ../instance-profiles/supervisor.cfg
   ../instance-profiles/zope.cfg
   ../instance-profiles/kvm.cfg

Modified: erp5/release/candidate/profiles/software-common.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/software-common.cfg?rev=42601&r1=42600&r2=42601&view=diff
==============================================================================
--- erp5/release/candidate/profiles/software-common.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/software-common.cfg [utf8] Fri Jan 21 19:38:08 2011
@@ -1,6 +1,7 @@
 [buildout]
 extensions =
   slapos.rebootstrap
+  slapos.tool.networkcache
   slapos.zcbworkarounds
   mr.developer
   buildout.dumppickedversions

Modified: erp5/release/candidate/profiles/versions-common.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/versions-common.cfg?rev=42601&r1=42600&r2=42601&view=diff
==============================================================================
--- erp5/release/candidate/profiles/versions-common.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/versions-common.cfg [utf8] Fri Jan 21 19:38:08 2011
@@ -31,6 +31,7 @@ setuptools =
 
 # Use version of slapos.rebootstrap, with stabilised prefix
 slapos.rebootstrap >= 2.1
+slapos.tool.networkcache >= 0.1.3
 
 # official pysvn egg does not supports --include-dirs and
 # --library-dirs, so we use our modified version

Modified: erp5/release/candidate/software-profiles/varnish.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/varnish.cfg?rev=42601&r1=42600&r2=42601&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/varnish.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/varnish.cfg [utf8] Fri Jan 21 19:38:08 2011
@@ -26,8 +26,8 @@ environment =
 # http://www.varnish-cache.org/trac/ticket/801
 [varnish-2.1.4-r5467-patch]
 recipe = hexagonit.recipe.download
-url = http://www.varnish-cache.org/trac/changeset/5467?format=diff&new=5467
-md5sum = 04a0696239658c87d6acac32f356608e
+url = http://www.varnish-cache.org/trac/changeset/a53a8a1c60f844eb62d047b62116fa7cb436cf5f?format=diff&new=a53a8a1c60f844eb62d047b62116fa7cb436cf5f
+md5sum = 0948d6c4ac64f197b362c17496f77a14
 filename = changeset_r5467.diff
 download-only = true
 
@@ -35,7 +35,7 @@ download-only = true
 recipe = hexagonit.recipe.cmmi
 url = http://www.varnish-software.com/sites/default/files/varnish-2.1.4.tar.gz
 md5sum = e794a37b6fbb786a083c0946103ae103
-patch-options = -p4
+patch-options = -p0
 patches =
   ${varnish-2.1.4-r5467-patch:location}/${varnish-2.1.4-r5467-patch:filename}
 environment =