conflict resolved in cherry pick

diff --git a/src/redis.c b/src/redis.c
index f2bb87fdd464152a33c9c4bfb21fd59c35cc33d1..84e5560e055e7012d8eb4fefd99ef99a3e1bd709 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -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