Markus Makela 3b29e1a1f0 Fixed merging conflicts.

2015-02-24 06:34:22 +02:00

..

core

Fixed merging conflicts.

2015-02-24 06:34:22 +02:00

include

Merge branch 'develop' into MAX-324

2015-02-24 06:26:55 +02:00

inih

remove makefiles and other garbage

2015-01-14 19:08:24 +02:00

modules

Fixed merging conflicts.

2015-02-24 06:34:22 +02:00

test

Renamed the dbshard module to schemarouter.

2015-02-24 05:49:38 +02:00

CMakeLists.txt

Fixed CMake builds overwriting MaxScale.cnf when installing after tests were built.

2014-10-14 19:15:59 +03:00

MaxScale_template.cnf

Added a note about enabling or disabling logfiles to MaxScale_template.cnf.

2015-02-06 17:49:37 +02:00