Markus Mäkelä 774e9d1efb Fix merge problems ...

The values were not removed from the merge.

2018-11-06 21:18:42 +02:00

..

authenticator

Format source code

2018-11-01 14:05:15 +02:00

filter

Fix binlogfilter build failure

2018-10-05 11:00:08 +03:00

include

MXS-2067: Remove spinlock.h

2018-09-28 12:18:24 +03:00

monitor

Disallow switchover promotion of a server low on disk space

2018-11-06 11:44:50 +02:00

protocol

Merge branch '2.2' into 2.3

2018-11-06 21:12:20 +02:00

routing

Fix merge problems

2018-11-06 21:18:42 +02:00

CMakeLists.txt

Fix devel package

2017-02-15 09:31:14 +02:00