From dcf6244805951b5a553e4e96e0c5ee010e66163b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 10 Mar 2011 08:45:59 +0000
Subject: [PATCH]  - use application defaults

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44094 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py           | 1 -
 slapos/recipe/erp5/src/slapos/recipe/erp5/template/memcached.in | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
index 889656d5c4..685625c141 100644
--- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
@@ -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,
diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/template/memcached.in b/slapos/recipe/erp5/src/slapos/recipe/erp5/template/memcached.in
index 2738c704a6..92dae43a99 100644
--- a/slapos/recipe/erp5/src/slapos/recipe/erp5/template/memcached.in
+++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/template/memcached.in
@@ -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
-- 
2.30.9