From 3c451dbfca58148118c9dc5700c2dc1204874f92 Mon Sep 17 00:00:00 2001
From: Karol Babioch <kbabioch@suse.de>
Date: Nov 15 2019 07:01:22 +0000
Subject: Merge branch 'firewall-slimhat' into 'production'


Use and instead of ampersand in description of firewalld service

See merge request infra/salt!284
---

diff --git a/pillar/id/slimhat_infra_opensuse_org.sls b/pillar/id/slimhat_infra_opensuse_org.sls
index 20fd2cb..160c504 100644
--- a/pillar/id/slimhat_infra_opensuse_org.sls
+++ b/pillar/id/slimhat_infra_opensuse_org.sls
@@ -29,7 +29,7 @@ firewalld:
     monitoring:
       short: monitoring
       description: >-
-        These ports are required for monitoring based on check_mk & NRPE.
+        These ports are required for monitoring based on check_mk and NRPE.
       ports:
         tcp:
           - 5665