Merge branch 'develop' into binlog_server_mariadb_master_encryption

This commit is contained in:
MassimilianoPinto
2016-10-17 10:32:41 +02:00
79 changed files with 905 additions and 835 deletions

View File

@ -72,7 +72,6 @@
#include <maxscale/housekeeper.h>
#include <time.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>
#include <maxscale/protocol/mysql.h>

View File

@ -43,7 +43,6 @@
#include <maxscale/dcb.h>
#include <maxscale/spinlock.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>

View File

@ -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>

View File

@ -69,7 +69,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>
#include <maxscale/rdtsc.h>

View File

@ -81,7 +81,6 @@
#include <maxscale/spinlock.h>
#include <maxscale/housekeeper.h>
#include <sys/stat.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>
#include <maxscale/version.h>
#include <zlib.h>

View File

@ -36,7 +36,6 @@
#include <maxscale/spinlock.h>
#include <maxscale/housekeeper.h>
#include <time.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>
#include <maxscale/gwdirs.h>
#include <maxscale/alloc.h>