Commit 29920dce authored by antirez's avatar antirez
Browse files

conflict resolved in cherry pick

parent f96a9f82
......@@ -945,6 +945,7 @@ void initServer() {
}
if (server.ds_enabled) dsInit();
srand(time(NULL)^getpid());
}
/* Populates the Redis Command Table starting from the hard coded list
......
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