benthompson15 3748036772 Merge pull request #371 from mariadb-corporation/1.1-merge-up-20180118 ...

1.1 merge up 20180118

2018-01-19 12:19:42 -06:00

..

CMakeLists.txt

Merge branch 'develop-1.0' into 1.1-merge-up-20180118

2018-01-18 16:28:08 +00:00

main.cpp

Merge branch 'develop-1.0' into 1.1-merge-up-20180118

2018-01-18 16:28:08 +00:00

processmonitor.cpp

MCOL-1137 - fixed master/slave setup after failvover

2018-01-18 17:14:14 -06:00

processmonitor.h

MCOL-942 - backported mysql rep fixes from 1.1

2017-11-28 13:19:28 -06:00

procmon.vpj

add back in windows project files

2016-01-13 15:52:33 -06:00