Commit 30b345dd authored by antirez's avatar antirez
Browse files

more slow log merge, I forgot to resolve a conflict.

parent 06966abc
...@@ -404,15 +404,12 @@ struct redisServer { ...@@ -404,15 +404,12 @@ struct redisServer {
long long stat_evictedkeys; /* number of evicted keys (maxmemory) */ long long stat_evictedkeys; /* number of evicted keys (maxmemory) */
long long stat_keyspace_hits; /* number of successful lookups of keys */ long long stat_keyspace_hits; /* number of successful lookups of keys */
long long stat_keyspace_misses; /* number of failed lookups of keys */ long long stat_keyspace_misses; /* number of failed lookups of keys */
<<<<<<< HEAD
size_t stat_peak_memory; /* max used memory record */ size_t stat_peak_memory; /* max used memory record */
long long stat_fork_time; /* time needed to perform latets fork() */ long long stat_fork_time; /* time needed to perform latets fork() */
=======
list *slowlog; list *slowlog;
long long slowlog_entry_id; long long slowlog_entry_id;
long long slowlog_log_slower_than; long long slowlog_log_slower_than;
unsigned long slowlog_max_len; unsigned long slowlog_max_len;
>>>>>>> ad6347b... Slowlog backported to 2.2
/* Configuration */ /* Configuration */
int verbosity; int verbosity;
int maxidletime; int maxidletime;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment