saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2018.3' into mysql-module-fix-for-python3

Browse source
This commit is contained in:
Proskurin Kirill 2019-03-01 00:03:25 +00:00 • committed by GitHub
commit 58d8a2e774
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/grains/zfs.py
View file

@ -45,6 +45,9 @@ def __virtual__():
'''
# NOTE: we always load this grain so we can properly export
# at least the zfs_support grain
# except for Windows... don't try to load this on Windows (#51703)
if salt.utils.platform.is_windows():
return False, 'ZFS: Not available on Windows'
return __virtualname__