Merge branch '2.1' into 2.2

2017-11-27 09:10:33 +02:00
parent dc2286c774 a418804c83
commit a72956e2f3
22 changed files with 1272 additions and 846 deletions
--- a/plugins/nagios/check_maxscale_resources.pl
+++ b/plugins/nagios/check_maxscale_resources.pl
@ -118,7 +118,7 @@ chop($resource_type);
 my $resource_match = ucfirst("$resource_type Name");

 if ($resource_type eq "listener") {
-        $resource_match = "Service Name";
+        $resource_match = "Name";
 }
 if ($resource_type eq "filter") {
        $resource_match = "Filter";