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

Merge branch 'develop' of github.com:saltstack/salt into develop

Browse Source
This commit is contained in:
Thomas S Hatch 2012-03-17 15:59:18 -06:00
commit 6e70ba26df
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

@ -461,7 +461,6 @@ def hostname():
comps = grains['fqdn'].split('.')
grains['host'] = comps[0]
grains['localhost'] = socket.gethostname()
grains['localfqdn'] = __salt__['cmd.run']('hostname -f').strip()
if len(comps) > 1:
grains['domain'] = '.'.join(comps[1:])
else: