Merge pull request #3188 from therealbill/unstable

maxmemory_policy fix for #3187
This commit is contained in:
Salvatore Sanfilippo
2016-05-05 09:02:25 +02:00
3 changed files with 4 additions and 4 deletions

View File

@ -126,8 +126,8 @@ const char *configEnumGetNameOrUnknown(configEnum *ce, int val) {
}
/* Used for INFO generation. */
const char *maxmemoryToString(void) {
return configEnumGetNameOrUnknown(maxmemory_policy_enum,server.maxmemory);
const char *evictPolicyToString(void) {
return configEnumGetNameOrUnknown(maxmemory_policy_enum,server.maxmemory_policy);
}
/*-----------------------------------------------------------------------------