Commit f231edc6 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents ddd9fd41 d76c663d
...@@ -3381,10 +3381,11 @@ void usage() { ...@@ -3381,10 +3381,11 @@ void usage() {
void redisAsciiArt(void) { void redisAsciiArt(void) {
#include "asciilogo.h" #include "asciilogo.h"
char *buf = zmalloc(1024*16); char *buf = zmalloc(1024*16);
char *mode = "stand alone"; char *mode;
if (server.cluster_enabled) mode = "cluster"; if (server.cluster_enabled) mode = "cluster";
else if (server.sentinel_mode) mode = "sentinel"; else if (server.sentinel_mode) mode = "sentinel";
else mode = "standalone";
snprintf(buf,1024*16,ascii_logo, snprintf(buf,1024*16,ascii_logo,
REDIS_VERSION, REDIS_VERSION,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment