Merge branch '2.0' into 2.1

2017-05-10 09:12:42 +03:00
parent 09349aaa22 898bc3444e
commit 8e2c7fd952
15 changed files with 198 additions and 83 deletions
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@ -59,7 +59,6 @@

 #define MXS_MODULE_NAME "mqfilter"

-#include <my_config.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.h>