counterpoint dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111 ...

# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.

2015-11-11 11:08:02 +00:00

..

test

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

CMakeLists.txt

Fixed missing utils link in log manager.

2015-05-08 05:07:01 +03:00

log_manager.cc

Interface of skygw_logmanager_init(int argc, char* argv[]) changed.

2015-11-06 14:20:05 +02:00

log_manager.h

Interface of skygw_logmanager_init(int argc, char* argv[]) changed.

2015-11-06 14:20:05 +02:00