saltstack/salt — pull request #2293 by vbulax (2012-10-19 15:57:08+00:00)
Title: Update salt/grains/core.py

Resolves grains conflict.
grains['host'] in os_data() rewrites grains['host'] in hostname()