Merge from develop

2015-10-28 09:38:31 +01:00
parent a066b34e8e 4c0406a69c
commit d7d009f3b3
354 changed files with 275256 additions and 408 deletions
--- a/server/modules/routing/binlog/maxbinlogcheck.c
+++ b/server/modules/routing/binlog/maxbinlogcheck.c
@ -80,7 +80,7 @@ static struct option long_options[] = {
  {0, 0, 0, 0}
 };

-char *binlog_check_version = "1.0.0";
+char *binlog_check_version = "1.1.0";

 int
 MaxScaleUptime()