summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2018-08-27 12:17:14 +0200
committerantirez <antirez@gmail.com>2018-08-29 12:28:55 +0200
commit319f2ee6591ce692c15f2d0a7ff97884c749bd61 (patch)
tree3c97dce56eb87048bd64b47ca17ef7c77e71e98d
parent22c166da5af08ca910b9bcc2cf5dfe22b8c3769c (diff)
downloadredis-319f2ee6591ce692c15f2d0a7ff97884c749bd61.tar.gz
Re-apply rebased #2358.
-rw-r--r--src/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/config.c b/src/config.c
index 7bd9592b2..b15cb6d77 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1181,7 +1181,7 @@ void configSetCommand(client *c) {
} config_set_memory_field("maxmemory",server.maxmemory) {
if (server.maxmemory) {
if (server.maxmemory < zmalloc_used_memory()) {
- serverLog(LL_WARNING,"WARNING: the new maxmemory value set via CONFIG SET is smaller than the current memory usage. This will result in keys eviction and/or inability to accept new write commands depending on the maxmemory-policy.");
+ serverLog(LL_WARNING,"WARNING: the new maxmemory value set via CONFIG SET is smaller than the current memory usage. This will result in key eviction and/or the inability to accept new write commands depending on the maxmemory-policy.");
}
freeMemoryIfNeeded();
}