Merge branch '2.2' into 2.2-mrm

2017-10-30 11:06:34 +02:00
parent 41cd0cd6d7 a971aa25da
commit 3a78b716b8
49 changed files with 1458 additions and 500 deletions
--- a/include/maxscale/monitor.h
+++ b/include/maxscale/monitor.h
@ -340,7 +340,7 @@ json_t* monitor_list_to_json(const char* host);
 * @param server Server to inspect
 * @param host   Hostname of this server
 *
- * @return Array of monitor links
+ * @return Array of monitor links or NULL if no relations exist
 */
 json_t* monitor_relations_to_server(const SERVER* server, const char* host);