summaryrefslogtreecommitdiff
path: root/src/config.c
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2016-05-05 09:02:25 +0200
committerSalvatore Sanfilippo <antirez@gmail.com>2016-05-05 09:02:25 +0200
commit91b4966783cc0c4ec3985806f93606db60158ca7 (patch)
tree9e58d607e56c2b141df6557e9d18c391c7587f85 /src/config.c
parentde3a6736f704704619d8dab6fd967208e859df46 (diff)
parent14086a46ca69f267d909817eb6bbcd1d976d94f2 (diff)
downloadredis-91b4966783cc0c4ec3985806f93606db60158ca7.tar.gz
Merge pull request #3188 from therealbill/unstable
maxmemory_policy fix for #3187
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index ba835455c..1fc24a56c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -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);
}
/*-----------------------------------------------------------------------------