Merge branch 'develop' into binlog_server_mariadb_master_encryption

2016-10-17 12:20:23 +02:00
parent 3ce501a975 15de0a0fb3
commit cf3be88c75
26 changed files with 77 additions and 162 deletions
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@ -79,7 +79,6 @@
 #include <sys/stat.h>
 #include <uuid/uuid.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>

 static char *version_str = "V2.1.0";