Merge branch 'develop' into binlog_server_mariadb_master_encryption

2016-10-17 10:32:41 +02:00
parent a9e00473c1 8aafa34d66
commit 3ce501a975
79 changed files with 905 additions and 835 deletions
--- a/server/modules/routing/binlog/blr_file.c
+++ b/server/modules/routing/binlog/blr_file.c
@ -59,7 +59,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/gwdirs.h>
-#include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 #include <inttypes.h>