Merge branch 'develop' into MAX-65

Conflicts:
	server/core/config.c

server/modules/protocol/httpd.c

@@ -39,6 +39,14 @@
 
 #include <httpd.h>
 #include <gw.h>
+#include <modinfo.h>
+
+MODULE_INFO info = {
+	MODULE_API_PROTOCOL,
+	MODULE_IN_DEVELOPMENT,
+	GWPROTOCOL_VERSION,
+	"An experimental HTTPD implementation for use in admnistration"
+};
 
 #define ISspace(x) isspace((int)(x))
 #define HTTP_SERVER_STRING "Gateway(c) v.1.0.0"

server/modules/protocol/mysql_backend.c

@@ -43,6 +43,14 @@
  * 27/09/2013	Massimiliano Pinto	Changed in gw_read_backend_event the check for dcb_read(), now is if rc < 0
  *
  */
+#include <modinfo.h>
+
+MODULE_INFO info = {
+	MODULE_API_PROTOCOL,
+	MODULE_ALPHA_RELEASE,
+	GWPROTOCOL_VERSION,
+	"The MySQL to backend server protocol"
+};
 
 extern int lm_enabled_logfiles_bitmask;
 

server/modules/protocol/mysql_client.c

@@ -40,6 +40,14 @@
 #include <log_manager.h>
 #include <mysql_client_server_protocol.h>
 #include <gw.h>
+#include <modinfo.h>
+
+MODULE_INFO info = {
+	MODULE_API_PROTOCOL,
+	MODULE_ALPHA_RELEASE,
+	GWPROTOCOL_VERSION,
+	"The client to MaxScale MySQL protocol implementation"
+};
 
 extern int lm_enabled_logfiles_bitmask;
 

server/modules/protocol/telnetd.c

@@ -36,6 +36,14 @@
 #include <adminusers.h>
 #include <skygw_utils.h>
 #include <log_manager.h>
+#include <modinfo.h>
+
+MODULE_INFO info = {
+	MODULE_API_PROTOCOL,
+	MODULE_ALPHA_RELEASE,
+	GWPROTOCOL_VERSION,
+	"A telnet deamon protocol for simple administration interface"
+};
 
 extern int lm_enabled_logfiles_bitmask;