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/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@ -13,7 +13,6 @@

 #include "schemarouter.h"

-#include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
--- a/server/modules/routing/schemarouter/sharding_common.h
+++ b/server/modules/routing/schemarouter/sharding_common.h
@ -15,7 +15,6 @@
 */

 #include <maxscale/cdefs.h>
-#include <my_config.h>
 #include <poll.h>
 #include <maxscale/buffer.h>
 #include <maxscale/modutil.h>