Merge 10.0.14 into 10.1

This commit is contained in:
Sergei Golubchik 2014-10-15 12:59:13 +02:00
commit f62c12b405
2115 changed files with 88123 additions and 80328 deletions

View file

@ -5265,7 +5265,7 @@ sub get_extra_opts {
sub stop_servers($$) {
my (@servers)= @_;
mtr_report("Restarting ", started(@servers));
mtr_report("Stopping ", started(@servers));
My::SafeProcess::shutdown($opt_shutdown_timeout,
started(@servers));