Merge branch '2.0' into 2.1

2017-02-20 11:17:49 +02:00
parent f54c0a5b81 f7cc548093
commit 61f2d96a58
7 changed files with 139 additions and 89 deletions
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@ -991,7 +991,8 @@ extract_message(GWBUF *errpkt)
 *
 */
 static void
-errorReply(MXS_ROUTER *instance, void *router_session, GWBUF *message, DCB *backend_dcb, mxs_error_action_t action,
+errorReply(MXS_ROUTER *instance, void *router_session, GWBUF *message, DCB *backend_dcb,
+           mxs_error_action_t action,
           bool *succp)
 {
    /** We should never end up here */