diff options
| author | antirez <antirez@gmail.com> | 2017-09-19 10:35:49 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2017-09-19 10:35:49 +0200 |
| commit | a4152119c6c13e5a8940513e0983e02d5c5545f2 (patch) | |
| tree | 556bbbb9272f46b7306a083188e0fc38c3c91ece | |
| parent | b75ae0bbea794dbfd6549d308ab29f9b963e0722 (diff) | |
| parent | 2d13bf4c59e25e179e530edbd907cfd3749f8cc2 (diff) | |
| download | redis-a4152119c6c13e5a8940513e0983e02d5c5545f2.tar.gz | |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
| -rw-r--r-- | src/redis-benchmark.c | 4 | ||||
| -rw-r--r-- | src/redis-cli.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c index dec8ecb52..928ec31e0 100644 --- a/src/redis-benchmark.c +++ b/src/redis-benchmark.c @@ -572,8 +572,8 @@ usage: " -a <password> Password for Redis Auth\n" " -c <clients> Number of parallel connections (default 50)\n" " -n <requests> Total number of requests (default 100000)\n" -" -d <size> Data size of SET/GET value in bytes (default 2)\n" -" --dbnum <db> SELECT the specified db number (default 0)\n" +" -d <size> Data size of SET/GET value in bytes (default 3)\n" +" --dbnum <db> SELECT the specified db number (default 0)\n" " -k <boolean> 1=keep alive 0=reconnect (default 1)\n" " -r <keyspacelen> Use random keys for SET/GET/INCR, random values for SADD\n" " Using this option the benchmark will expand the string __rand_int__\n" diff --git a/src/redis-cli.c b/src/redis-cli.c index 705d917e9..ca9fe6ad7 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -632,7 +632,6 @@ sds sdscatcolor(sds o, char *s, size_t len, char *color) { int bold = strstr(color,"bold") != NULL; int ccode = 37; /* Defaults to white. */ if (strstr(color,"red")) ccode = 31; - else if (strstr(color,"red")) ccode = 31; else if (strstr(color,"green")) ccode = 32; else if (strstr(color,"yellow")) ccode = 33; else if (strstr(color,"blue")) ccode = 34; |