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

Fixing merge conflict

Browse Source
This commit is contained in:
Nitin Madhok 2014-06-26 13:55:57 -04:00
parent 84ed5b7863
commit 5157c2c93b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/rh_service.py
View File

@ -57,7 +57,7 @@ def __virtual__():
if __grains__['os'] == 'Fedora':
if int(__grains__.get('osrelease', 0).split('.')[0]) > 15:
return False
if __grains__['os'] in ('RedHat','CentOS','ScientificLinux'):
if __grains__['os'] in ('RedHat', 'CentOS', 'ScientificLinux'):
if int(__grains__.get('osrelease', 0).split('.')[0]) >= 7:
return False
return __virtualname__