Merge pull request #220 from noelmcloughlin/broken_merge

fix(macos): workaround broken map.jinja merge
saltstack-formulas · Jul 19, 2019 · 2f2282b · 2f2282b
2 parents b4b05c1 + 79faa17
commit 2f2282b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/docker/osfamilymap.yaml b/docker/osfamilymap.yaml
@@ -27,3 +27,5 @@ Suse:
 MacOS:
   pkg:
     name: docker
+    allow_updates: False
+    hold: False