saltstack/salt — pull request #12553 by cheuschober (2014-05-06 02:36:15+00:00)
Title: Fixes an oversight in the new modules.pillar.get merge parameter

The previous patch that added the `merge` parameter to `salt.modules.pillar.get` failed to address situations where no pillar data was found. This patch addresses that oversight. Admittedly, it's a lot more code than I'd like to have in so fundamental a function as pillar.get, but I believe the benefits outweigh the costs.