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 '2019.2.1' into shadow_fed_fix

Browse source
This commit is contained in:
Megan Wilhite 2019-05-22 09:42:41 -04:00 • committed by GitHub
commit a3c4066abd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/cloud/clouds/joyent.py
View file

@ -61,6 +61,7 @@ import datetime
try:
from M2Crypto import EVP
HAS_REQUIRED_CRYPTO = True
HAS_M2 = True
except ImportError:
HAS_M2 = False