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

The values were not removed from the merge.

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

..

avrorouter

Fix merge problems

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

binlogrouter

Merge branch '2.2' into 2.3

2018-10-30 14:16:33 +02:00

cat

MXS-2068: Split reply_is_complete into two functions

2018-09-26 09:43:25 +03:00

cli

MXS-2067: Remove spinlock.h

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

debugcli

MXS-2067: Remove spinlock.h

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

hintrouter

Partially revert 4ba011266843857bbd3201e5b925a47e88e1808f

2018-09-20 15:57:30 +03:00

maxinfo

MXS-2067: Remove spinlock.h

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

readconnroute

Add bias value to server score calculations

2018-10-03 08:41:44 +03:00

readwritesplit

Expand readwritesplit delayed retry error message

2018-11-06 15:09:14 +02:00

schemarouter

MXS-2067: Remove spinlock.h

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

CMakeLists.txt

MXS-1840 Compile all routers as C++

2018-05-07 14:06:22 +03:00