Markus Makela 80b83f0ac0 Merge branch 'develop' into firewall ...

Conflicts:
	server/modules/filter/test/CMakeLists.txt
	server/modules/filter/test/harness_common.c

2014-11-18 05:02:12 +02:00

..

core

MAX-328, Add session identifier to trace log entries. Session id is given to session in session_alloc and stored to thread's local storage variable when thread picks a new event from epoll_wait.

2014-11-17 23:27:14 +02:00

include

MAX-328, Add session identifier to trace log entries. Session id is given to session in session_alloc and stored to thread's local storage variable when thread picks a new event from epoll_wait.

2014-11-17 23:27:14 +02:00

inih

Renamed all occurences of SkySQL to MariaDB Corporation

2014-09-30 13:02:10 +03:00

modules

Merge branch 'develop' into firewall

2014-11-18 05:02:12 +02:00

test

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

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

CMakeLists.txt

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

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

Makefile

Updated non-source files with new company name.

2014-10-01 15:21:47 +03:00

MaxScale_template.cnf

Add the CLI to the template configuration file

2014-11-14 10:36:32 +00:00