saltstack/salt — pull request #14450 by stephanbuys (2014-07-24 06:42:24+00:00)
Title: Refinement on salt-ssh master conf grains, should always overwrite

This patch ensures that grains from a local source is always included, not just during refresh (otherwise certain refreshes that depend on templates with grains variables might fail).