diff --git a/Makefile b/Makefile index aea43f1dab049a0ad9b8a3234c77d19ded9aafa4..13b6bf4508ddc9fb79ecaf89564be8fbb231895c 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ staticsymbols: tclsh utils/build-static-symbols.tcl > staticsymbols.h test: - tclsh test-redis.tcl -p $(PORT) -h $(HOST) + tclsh8.5 test-redis.tcl -p $(PORT) -h $(HOST) bench: ./redis-benchmark diff --git a/redis.c b/redis.c index 38aad0a81f77fd25fdc39d2b4aae98d9f3f6b556..09de76665ac9da1da5b7adec8cc2449de7acb776 100644 --- a/redis.c +++ b/redis.c @@ -9934,7 +9934,7 @@ int linuxOvercommitMemoryValue(void) { void linuxOvercommitMemoryWarning(void) { if (linuxOvercommitMemoryValue() == 0) { - redisLog(REDIS_WARNING,"WARNING overcommit_memory is set to 0! Background save may fail under low condition memory. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect."); + redisLog(REDIS_WARNING,"WARNING overcommit_memory is set to 0! Background save may fail under low memory condition. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect."); } } #endif /* __linux__ */