Merge branch '2.1' into develop

2017-03-22 15:20:21 +02:00
parent 039f6e3487 27d81cda6a
commit 7bd05d4581
107 changed files with 3365 additions and 3638 deletions
--- a/server/modules/routing/cli/cli.c
+++ b/server/modules/routing/cli/cli.c
@ -272,6 +272,8 @@ execute(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *queue)
        queue = gwbuf_consume(queue, GWBUF_LENGTH(queue));
    }

+    MXS_INFO("MaxAdmin: %s", session->cmdbuf);
+
    execute_cmd(session);
    return 1;
 }