Skip to content

Commit

Permalink
Revert "Merge pull request redhat-openstack#55 from mattkenn4545/master"
Browse files Browse the repository at this point in the history
This reverts commit fbe8ebd, reversing
changes made to 11ef5ef.
  • Loading branch information
saz committed May 25, 2015
1 parent fbe8ebd commit b0b6669
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 1 addition & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions templates/memcached.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>

0 comments on commit b0b6669

Please sign in to comment.