Merge branch '2019.2' into patch-2

This commit is contained in:
Shane Lee 2019-03-20 17:05:36 -06:00 committed by GitHub
commit 3b6fdf8f4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -54,7 +54,7 @@ provisioner:
base:
"os:Windows":
- match: grain
- prep_windows
- windows
"*":
- <%= ENV['KITCHEN_STATE'] || 'git.salt' %>
pillars: