From: antirez <antirez@gmail.com>
Date: Mon, 21 Feb 2011 23:03:03 +0000 (+0100)
Subject: conflict resolved in cherry pick
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/29920dceb8e2b9806b2dcaf1dd134081e596633d

conflict resolved in cherry pick
---

diff --git a/src/redis.c b/src/redis.c
index f2bb87fd..84e5560e 100644
--- 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