conflict resolved in cherry pick

2011-02-22 00:03:03 +01:00 · 2011-02-22 00:03:03 +01:00 · 9261880e78
commit 9261880e78
parent 226157c42c
1 changed files with 1 additions and 0 deletions
--- 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