Merge branch '2.0' into develop

2016-09-09 15:12:58 +03:00
parent 07588a515d abd1ea53a6
commit d7f79942be
48 changed files with 1658 additions and 547 deletions
--- a/server/core/server.c
+++ b/server/core/server.c
@ -89,7 +89,6 @@ server_alloc(char *servname, char *protocol, unsigned short port)
    server->rlag = -2;
    server->master_id = -1;
    server->depth = -1;
-    server->slaves = NULL;
    server->parameters = NULL;
    server->server_string = NULL;
    spinlock_init(&server->lock);