[Erp5-report] r41178 kazuhiko - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec  7 01:20:55 2010
New Revision: 41178

URL: http://svn.erp5.org?rev=41178&view=rev
Log:
erp5.conflictresolver is useful for zeo server (never use it for zeo clients).

Modified:
    erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
    erp5/trunk/buildout/software-profiles/erp5.cfg

Modified: erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5-2.12.cfg?rev=41178&r1=41177&r2=41178&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] Tue Dec  7 01:20:55 2010
@@ -141,6 +141,7 @@ eggs =
   cloudooo
   collective.recipe.supervisor
   collective.recipe.template
+  erp5.conflictresolver
   erp5.recipe.cloudoooinstance
   erp5.recipe.genbt5list
   erp5.recipe.mysqldatabase

Modified: erp5/trunk/buildout/software-profiles/erp5.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5.cfg?rev=41178&r1=41177&r2=41178&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] Tue Dec  7 01:20:55 2010
@@ -127,6 +127,7 @@ eggs =
   cloudooo
   collective.recipe.supervisor
   collective.recipe.template
+  erp5.conflictresolver
   erp5.recipe.cloudoooinstance
   erp5.recipe.genbt5list
   erp5.recipe.mysqldatabase