Merge branch '2.0' into develop

2016-11-21 10:55:56 +02:00
parent 7ef1086040 3b30d5c810
commit 9e4ee0323d
22 changed files with 570 additions and 251 deletions
--- a/server/core/server.c
+++ b/server/core/server.c
@ -1031,6 +1031,7 @@ static struct
    { "ndb",         SERVER_NDB },
    { "maintenance", SERVER_MAINT },
    { "maint",       SERVER_MAINT },
+    { "stale",       SERVER_STALE_STATUS },
    { NULL,          0 }
 };