From b0b6669be8fea3da6b112037aa9281288f9fbb13 Mon Sep 17 00:00:00 2001 From: Steffen Zieger Date: Mon, 25 May 2015 20:55:09 +0200 Subject: [PATCH] Revert "Merge pull request #55 from mattkenn4545/master" This reverts commit fbe8ebdf2fa0db4d6f52e79efdcae773db248d1b, reversing changes made to 11ef5efea79fa5cd2c70637138b736fe8e9edc00. --- manifests/init.pp | 3 +-- templates/memcached.conf.erb | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9bcdb48de..08350ed0c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,8 +24,7 @@ $use_sasl = false, $use_registry = $::memcached::params::use_registry, $registry_key = 'HKLM\System\CurrentControlSet\services\memcached\ImagePath', - $large_mem_pages = false, - $object_size = undef + $large_mem_pages = false ) inherits memcached::params { # validate type and convert string to boolean if necessary diff --git a/templates/memcached.conf.erb b/templates/memcached.conf.erb index 2ed1e5a64..1586d9426 100644 --- a/templates/memcached.conf.erb +++ b/templates/memcached.conf.erb @@ -67,8 +67,3 @@ logfile <%= @logfile -%> # Disable automatic removal of items from the cache when out of memory -M <% end -%> - -<% if @object_size -%> -# Max Object size --I <%= object_size %> -<% end -%>