Merge branch '2.2' into develop

2018-04-03 11:01:06 +03:00
parent 3da5b535c8 9291815bcd
commit 9f256f50eb
17 changed files with 180 additions and 65 deletions
--- a/include/maxscale/backend.hh
+++ b/include/maxscale/backend.hh
@ -158,7 +158,7 @@ public:
    /**
     * @brief Get a pointer to the internal DCB
     *
-     * @return Pointer to internal DCB
+     * @return Pointer to DCB or NULL if not connected
     */
    inline DCB* dcb() const
    {