saltstack/salt-cloud — pull request #561 by s0undt3ch (2013-04-28 10:48:13+00:00)
Title: When loading a map, enforce a know data format. Refs #557 and #547.

* Simplified some code logic.
* Any additional data defined on the map, overrides the profile data.