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 pull request #36068 from rallytime/fix-35972

Browse source 
Remove grains type deprecation warning from 2016.3
This commit is contained in:
Mike Place 2016-09-09 19:00:50 +09:00 • committed by GitHub
commit 40127b6bf3
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/grains/core.py
View file

@ -1490,7 +1490,6 @@ def os_data():
osrelease_info[idx] = int(value)
grains['osrelease_info'] = tuple(osrelease_info)
grains['osmajorrelease'] = str(grains['osrelease_info'][0]) # This will be an integer in the two releases
salt.utils.warn_until('Nitrogen', 'The "osmajorrelease" will be a type of an integer.')
os_name = grains['os' if grains.get('os') in (
'FreeBSD', 'OpenBSD', 'NetBSD', 'Mac', 'Raspbian') else 'osfullname']
grains['osfinger'] = '{0}-{1}'.format(