conflict resolved in cherry pick
This commit is contained in:
parent
f96a9f82d8
commit
29920dceb8
@ -945,6 +945,7 @@ void initServer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (server.ds_enabled) dsInit();
|
if (server.ds_enabled) dsInit();
|
||||||
|
srand(time(NULL)^getpid());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Populates the Redis Command Table starting from the hard coded list
|
/* Populates the Redis Command Table starting from the hard coded list
|
||||||
|
Loading…
x
Reference in New Issue
Block a user