Merge branch '2.2' into 2.3

2019-06-19 10:54:37 +03:00
parent 35b5f2099b 27fb397041
commit 3d8475f8ed
5 changed files with 33 additions and 18 deletions
--- a/server/core/admin.cc
+++ b/server/core/admin.cc
@ -424,6 +424,7 @@ bool mxs_admin_init()
 void mxs_admin_shutdown()
 {
    MHD_stop_daemon(http_daemon);
+    MXS_NOTICE("Stopped MaxScale REST API");
 }

 bool mxs_admin_https_enabled()