Merge branch 'redis-vup' into next

* redis-vup: X redis: v↑ (2.8.23)

Merge branch 'redis-vup' into next
* redis-vup: X redis: v↑ (2.8.23)
e3367084 · Kirill Smelkov · 6ca54762 · 2d5c2a5e · e3367084 · e3367084
Commit e3367084 authored Oct 28, 2015 by Kirill Smelkov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 378 additions and 89 deletions

component/redis/buildout.cfg component/redis/buildout.cfg +5 -2

slapos/recipe/redis/template/redis.conf.in slapos/recipe/redis/template/redis.conf.in +373 -87

No files found.
--- a/component/redis/buildout.cfg
+++ b/component/redis/buildout.cfg
@@ -6,9 +6,12 @@ parts =
 extends = ../tcl/buildout.cfg
 [redis]
+<= redis28
+[redis28]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/geoffgarside/redis/archive/ipv6.tar.gz
+url = http://download.redis.io/releases/redis-2.8.23.tar.gz
-md5sum = 0eb594bd4e8ee746a0e2ef67b28cb5d8
+md5sum = ac7f43f845d0eedb8ae3e5e217b34c61
 configure-command = true
 prefix = 
 make-options =

--- a/slapos/recipe/redis/template/redis.conf.in
+++ b/slapos/recipe/redis/template/redis.conf.in