saltstack/salt — pull request #396 by mb0 (2011-12-26 07:17:24+00:00)
Title: add file state template context and defaults

this feature directly competes with whiteinge/salt@a8e47962b67da84aecadbe836cfeb6a362cfe08c
in contrast to the other commit it adds two dict paramaters. one updating the other.
this is very handy when updating a subset of the context variables of an extended state
although i am not sure if the use case is still valid with jinja includes in the picture.