Merge branch '2.1' into 2.2

2018-02-02 15:31:18 +02:00
parent d7d2d3349d facb8d60f7
commit e1f1d8e58a
15 changed files with 597 additions and 11 deletions
--- a/include/maxscale/config.h
+++ b/include/maxscale/config.h
@ -231,6 +231,7 @@ typedef struct
    int           query_retries;                       /**< Number of times a interrupted query is retried */
    time_t        query_retry_timeout;                 /**< Timeout for query retries */
    bool          substitute_variables;                /**< Should environment variables be substituted */
+    char*         local_address;                       /**< Local address to use when connecting */
 } MXS_CONFIG;

 /**