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

..

filter

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

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

include

Merge branch '1.2.1-binlog_router_trx' into develop

2015-11-04 16:42:30 +01:00

monitor

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

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

protocol

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

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

routing

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

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

CMakeLists.txt

initial implementation of the CMake build system

2014-09-11 18:24:41 +03:00