valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC

Browse Source
This commit is contained in:
Pedro Algarvio 2012-11-16 18:44:44 +00:00
commit b1de88ced5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/topics/eauth/access_control.rst
View File

@ -1,3 +1,5 @@
.. _acl:
=====================
Access Control System
=====================

2
doc/topics/eauth/index.rst
View File

@ -1,3 +1,5 @@
.. _acl-eauth:
==============================
External Authentication System
==============================

10
salt/modules/mysql.py
View File

@ -35,14 +35,10 @@ __opts__ = {}
def __virtual__():
'''
Only load this module if the mysql config is set
Only load this module if the mysql libraries exist
'''
if any(k.startswith('mysql.') for k in list(__opts__)):
if has_mysqldb:
return 'mysql'
elif any(k.startswith('mysql.') for k in list(__pillar__)):
if has_mysqldb:
return 'mysql'
if has_mysqldb:
return 'mysql'
return False