saltstack/salt — pull request #11395 by cheuschober (2014-03-20 21:25:01+00:00)
Title: Add pillar get merge

Adds a boolean parameter and conditional to pillar.get() that enables an optional merge of the passed default value. Useful for situations where grains.filter_by() is an overly complex solution (eg, no grains actually need be filtered).