Merge branch 'master' of git.bubblev.org:bubblev/bubble into feature/shadowban_fb

bin/jenkins/redis.conf.hbs

@@ -18,6 +18,5 @@ dir /tmp/redis-{{BUBBLE_REDIS_PORT}}
 lazyfree-lazy-eviction no
 lazyfree-lazy-expire no
 lazyfree-lazy-server-del no
-replica-lazy-flush no
 appendonly no
 appendfilename "appendonly-{{BUBBLE_REDIS_PORT}}.aof"

bin/jenkins/test-redis

@@ -30,7 +30,7 @@ function start_redis() {
   cat ${THISDIR}/redis.conf.hbs | sed -e "s/{{BUBBLE_REDIS_PORT}}/${port}/g" > ${REDIS_CONF} || die "Error writing redis configuration to ${REDIS_CONF}"
 
   echo "Starting redis..."
-  redis-server ${REDIS_CONF}
+  redis-server ${REDIS_CONF} || die "Error starting redis"
   echo "Redis successfully started on port ${port}"
 }