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

..

binlog

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

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

maxinfo

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

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

readwritesplit

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

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

schemarouter

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

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

test

File restored

2015-08-25 19:02:27 +02:00

cli.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

CMakeLists.txt

Removed redundant linking of the utils library.

2015-08-10 10:40:00 +03:00

debugcli.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

debugcmd.c

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

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

GaleraHACRoute.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

readconnroute.c

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

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

testroute.c

Added more function parameter checks.

2015-08-18 22:19:26 +03:00

webserver.c

Renamed all occurences of SkySQL to MariaDB Corporation

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