hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'install_dir_change' into develop

Browse Source 
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
This commit is contained in:
Markus Makela
2015-05-26 13:34:39 +03:00
parent 9c461450e2 04aaaea717
commit 5f076b81d4
64 changed files with 954 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/test/MaxScale_test.cnf → server/test/maxscale_test.cnf
View File

@ -1,5 +1,10 @@
[maxscale]
threads=4
libdir=@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@
logdir=@CMAKE_INSTALL_PREFIX@/log
datadir=@CMAKE_INSTALL_PREFIX@/data
cachedir=@CMAKE_INSTALL_PREFIX@/cache
language=@CMAKE_INSTALL_PREFIX@/lib/maxscale/
[feedback]
feedback_enable=true