[Erp5-report] r44094 luke - in /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5:...

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 09:45:59 2011
New Revision: 44094

URL: http://svn.erp5.org?rev=44094&view=rev
Log:
 - use application defaults

Modified:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/memcached.in

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py?rev=44094&r1=44093&r2=44094&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] Thu Mar 10 09:45:59 2011
@@ -62,7 +62,6 @@ CONFIG = dict(
   haproxy_key_auth_port=16000,
   # Memcached
   memcached_port=11000,
-  memcached_mem_limit=256, # in MB
   # Kumofs
   kumo_manager_port=13101,
   kumo_server_port=13201,

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/memcached.in
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/memcached.in?rev=44094&r1=44093&r2=44094&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/memcached.in [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/memcached.in [utf8] Thu Mar 10 09:45:59 2011
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec %(memcached_binary)s -p %(memcached_port)s -U %(memcached_port)s -l %(memcached_ip)s -m %(memcached_mem_limit)s
+exec %(memcached_binary)s -p %(memcached_port)s -U %(memcached_port)s -l %(memcached_ip)s