Merge branch 'develop' into schemarouter_refresh

2015-06-15 08:46:05 +03:00
parent f6f5de92eb d3cc9be52e
commit c2d69850de
2 changed files with 2 additions and 3 deletions
--- a/server/modules/include/schemarouter.h
+++ b/server/modules/include/schemarouter.h
@ -316,7 +316,6 @@ typedef struct router_instance {
        struct router_instance* next;        /*< Next router on the list            */
 	bool			available_slaves; /*< The router has some slaves available */

-
 } ROUTER_INSTANCE;

 #define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER :    \