Merge branch 'develop' into MAX-65

2014-06-04 21:14:31 +01:00
parent 57e910ad3d 7e863657db
commit f612b90cd7
10 changed files with 106 additions and 29 deletions
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@ -773,11 +773,13 @@ static struct {
 	char		*str;
 	unsigned int	bit;
 } ServerBits[] = {
-	{ "running", 	SERVER_RUNNING },
-	{ "master",	SERVER_MASTER },
-	{ "slave",	SERVER_SLAVE },
-	{ "synced",	SERVER_JOINED },
-	{ NULL,		0 }
+	{ "running", 		SERVER_RUNNING },
+	{ "master",		SERVER_MASTER },
+	{ "slave",		SERVER_SLAVE },
+	{ "synced",		SERVER_JOINED },
+	{ "maintenance",	SERVER_MAINT },
+	{ "maint",		SERVER_MAINT },
+	{ NULL,			0 }
 };
 /**
 * Map the server status bit