Merge branch 'develop' into MXS-121

2015-05-18 16:05:50 +03:00
parent c3a243cd30 36b963805b
commit 8c120ca469
21 changed files with 393 additions and 61 deletions
--- a/server/include/server.h
+++ b/server/include/server.h
@ -118,7 +118,7 @@ typedef struct server {
 */
 #define	SERVER_IS_RUNNING(server)	(((server)->status & (SERVER_RUNNING|SERVER_MAINT)) == SERVER_RUNNING)
 /**
- * Is the server marked as down - the macro returns true if the server is beleived
+ * Is the server marked as down - the macro returns true if the server is believed
 * to be inoperable.
 */
 #define	SERVER_IS_DOWN(server)		(((server)->status & SERVER_RUNNING) == 0)