gistfile1.diff

diff --git a/redis/resources/redis.conf.erb b/redis/resources/redis.conf.erb
index 8934ab0..dacfc51 100644
--- a/redis/resources/redis.conf.erb
+++ b/redis/resources/redis.conf.erb
@@ -1,9 +1,6 @@
 requirepass <%= password %>
 port <%= port %>
 maxmemory <%= memory %>mb
-vm-swap-file <%= swap_file %>
-vm-max-memory <%= vm_max_memory %>mb
-vm-pages <%= vm_pages %>
 dir <%= data_dir %>
 logfile <%= log_file %>
 
@@ -17,11 +14,8 @@ save 300 10
 save 60 10000
 maxclients <%= maxclients %>
 appendonly no
-vm-enabled yes
-vm-page-size 32
-glueoutputbuf yes
-hash-max-zipmap-entries 64
-hash-max-zipmap-value 512
+hash-max-ziplist-entries 64
+hash-max-ziplist-value 512
 activerehashing yes
 
 rename-command CONFIG <%= config_command %>