Markus Mäkelä c82831cc10 Fix merge conflict ...

An old define name caused the build to fail.

2017-02-08 09:29:26 +02:00

..

avrorouter

Fix merge conflict

2017-02-08 09:29:26 +02:00

binlogrouter

Merge branch '2.0' into develop

2017-02-01 09:35:13 +02:00

cli

Clean up router.h

2017-01-26 16:14:17 +02:00

debugcli

Remove useless maxadmin commands

2017-02-06 10:29:10 +02:00

maxinfo

Clean up router.h

2017-01-26 16:14:17 +02:00

readconnroute

Clean up router.h

2017-01-26 16:14:17 +02:00

readwritesplit

Add readwritesplit options to diagnostic output

2017-01-27 12:19:27 +02:00

schemarouter

Clean up router.h

2017-01-26 16:14:17 +02:00

testroute

Clean up router.h

2017-01-26 16:14:17 +02:00

CMakeLists.txt

Rename BUILD_AVRO to BUILD_CDC

2017-02-03 14:39:56 +02:00